diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-12-02 04:32:06 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-12-02 04:32:06 +0100 |
| commit | a45bd509014743d21a532194d7b658a1aeb00cb7 (patch) | |
| tree | d5fc155ee50d2f41fa9e7d4a253a8f9c51bc9e51 /src/glsl/SConscript | |
| parent | 1aeca287a827f29206078fa1204715a477072c08 (diff) | |
| parent | 32e1e591467d9a28c2ac4d2e17af7be2dc429d43 (diff) | |
| download | mesa-gallium-array-textures.tar.gz | |
Merge remote branch 'origin/master' into gallium-array-texturesgallium-array-textures
Conflicts:
src/gallium/drivers/i915/i915_resource_texture.c
src/gallium/drivers/i915/i915_state_emit.c
src/gallium/drivers/i915/i915_surface.c
Diffstat (limited to 'src/glsl/SConscript')
| -rw-r--r-- | src/glsl/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript index fd22f668631..b5b1728beef 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -49,6 +49,7 @@ sources = [ 'loop_analysis.cpp', 'loop_controls.cpp', 'loop_unroll.cpp', + 'lower_discard.cpp', 'lower_if_to_cond_assign.cpp', 'lower_instructions.cpp', 'lower_jumps.cpp', @@ -66,6 +67,7 @@ sources = [ 'opt_dead_code.cpp', 'opt_dead_code_local.cpp', 'opt_dead_functions.cpp', + 'opt_discard_simplification.cpp', 'opt_function_inlining.cpp', 'opt_if_simplification.cpp', 'opt_noop_swizzle.cpp', |