diff options
| author | Eric Anholt <eric@anholt.net> | 2010-07-06 18:09:39 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-07 09:10:48 -0700 |
| commit | d674ebcee0d2731e50d6530502cefcebc39dcdb6 (patch) | |
| tree | 74feecda4fdc277c972e01267289a66cd45415f6 /src/mesa | |
| parent | 6de882334ac7f3d32d04261adfed1397e075ffd5 (diff) | |
glsl2: Add a pass to simplify if statements returning from both sides.
This allows function inlining making the following tests work even
without function calls implemented:
glsl-fs-functions-2
glsl-fs-functions-3
glsl-vs-functions
glsl-vs-functions-2
glsl-vs-functions-3
glsl-vs-vec4-indexing-5
(Note that those tests were designed to trigger actual function calls,
and this defeats them. However, those testcases ended up catching the
bug in the previous commit.)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/shader/ir_to_mesa.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp index daf09e9e65..2ffff60065 100644 --- a/src/mesa/shader/ir_to_mesa.cpp +++ b/src/mesa/shader/ir_to_mesa.cpp @@ -1821,6 +1821,7 @@ _mesa_glsl_compile_shader(GLcontext *ctx, struct gl_shader *shader) progress = do_dead_code_unlinked(state, shader->ir) || progress; progress = do_constant_variable_unlinked(shader->ir) || progress; progress = do_constant_folding(shader->ir) || progress; + progress = do_if_return(shader->ir) || progress; progress = do_vec_index_to_swizzle(shader->ir) || progress; /* Do this one after the previous to let the easier pass handle |