nir: remove dependency on glsl
authorRob Clark <robclark@freedesktop.org>
Sat, 10 Oct 2015 17:55:07 +0000 (13:55 -0400)
committerRob Clark <robclark@freedesktop.org>
Fri, 16 Oct 2015 23:33:38 +0000 (19:33 -0400)
commitb9b40ef9b7644ea24768bc8b7464b1719efe99bf
treeccca8ea0f2a4d0cbc6009cade33d9daf3c588c07
parent183db3a64557d5d231ef58ab5666286f323ff333
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>
32 files changed:
src/gallium/targets/libgl-xlib/SConscript
src/gallium/targets/libgl-xlib/glsl_types_hack.cpp [new file with mode: 0644]
src/glsl/Makefile.am
src/glsl/Makefile.sources
src/glsl/SConscript
src/glsl/builtin_type_macros.h [deleted file]
src/glsl/glsl_types.cpp [deleted file]
src/glsl/glsl_types.h [deleted file]
src/glsl/nir/builtin_type_macros.h [new file with mode: 0644]
src/glsl/nir/glsl_types.cpp [new file with mode: 0644]
src/glsl/nir/glsl_types.h [new file with mode: 0644]
src/glsl/nir/nir_types.h
src/mesa/Android.libmesa_dricore.mk
src/mesa/Android.libmesa_glsl_utils.mk
src/mesa/Android.libmesa_st_mesa.mk
src/mesa/Makefile.sources
src/mesa/SConscript
src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs.h
src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
src/mesa/drivers/dri/i965/brw_lower_unnormalized_offset.cpp
src/mesa/drivers/dri/i965/brw_schedule_instructions.cpp
src/mesa/drivers/x11/SConscript
src/mesa/main/ff_fragment_shader.cpp
src/mesa/main/uniforms.h
src/mesa/program/Android.mk
src/mesa/program/ir_to_mesa.cpp
src/mesa/program/sampler.cpp