diff options
| author | Rob Clark <robclark@freedesktop.org> | 2015-10-10 13:55:07 -0400 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2015-10-16 19:33:38 -0400 |
| commit | b9b40ef9b7644ea24768bc8b7464b1719efe99bf (patch) | |
| tree | ccca8ea0f2a4d0cbc6009cade33d9daf3c588c07 /src/gallium/targets/libgl-xlib | |
| parent | 183db3a64557d5d231ef58ab5666286f323ff333 (diff) | |
| download | external_mesa3d-b9b40ef9b7644ea24768bc8b7464b1719efe99bf.zip external_mesa3d-b9b40ef9b7644ea24768bc8b7464b1719efe99bf.tar.gz external_mesa3d-b9b40ef9b7644ea24768bc8b7464b1719efe99bf.tar.bz2 | |
nir: remove dependency on glsl
Move glsl_types into NIR, now that the dependency on glsl_symbol_table
has been split out.
Possibly makes sense to rename things at this point, but if we do that
I'd like to keep it split out into a separate patch to make git history
easier to follow (IMHO).
v2: fix android build
v3: I f***ing hate scons.. but at least it builds
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 3 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/glsl_types_hack.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index df5a220..fedc522 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -6,6 +6,8 @@ Import('*') env = env.Clone() env.Append(CPPPATH = [ + '#/src/glsl', + '#/src/glsl/nir', '#/src/mapi', '#/src/mesa', '#/src/mesa/main', @@ -36,6 +38,7 @@ env.Prepend(LIBS = [ sources = [ 'xlib.c', + 'glsl_types_hack.cpp', ] if True: diff --git a/src/gallium/targets/libgl-xlib/glsl_types_hack.cpp b/src/gallium/targets/libgl-xlib/glsl_types_hack.cpp new file mode 100644 index 0000000..5c042f2 --- /dev/null +++ b/src/gallium/targets/libgl-xlib/glsl_types_hack.cpp @@ -0,0 +1,3 @@ +/* errrg scons.. otherwise "scons: *** Two environments with different actions were specified for the same target: $mesa/build/linux-x86_64-debug/glsl/nir/glsl_types.os" */ +#include "glsl_types.cpp" + |