diff options
| author | Kenneth Graunke <[email protected]> | 2014-04-08 15:43:46 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-04-11 17:41:37 -0700 |
| commit | da22221aa365923e033a65c1fbe19ed27301d000 (patch) | |
| tree | 8a5ebb22586a159dd16b6b5ce9dc582ed9ca5fc0 /src/glsl/test_optpass.cpp | |
| parent | f00a6483e997e8377b62940e6cbe8f750272e3e9 (diff) | |
glsl: Drop do_common_optimization's max_unroll_iterations parameter.
Now that we pass in gl_shader_compiler_options, it makes sense to just
use options->MaxUnrollIterations, rather than passing a separate
parameter.
Half of the invocations already passed options->MaxUnrollIterations,
while the other half passed in a hardcoded value of 32.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/glsl/test_optpass.cpp')
| -rw-r--r-- | src/glsl/test_optpass.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/test_optpass.cpp b/src/glsl/test_optpass.cpp index 79fb17a9e4c..db5cb266207 100644 --- a/src/glsl/test_optpass.cpp +++ b/src/glsl/test_optpass.cpp @@ -62,9 +62,8 @@ do_optimization(struct exec_list *ir, const char *optimization, int int_3; int int_4; - if (sscanf(optimization, "do_common_optimization ( %d , %d ) ", - &int_0, &int_1) == 2) { - return do_common_optimization(ir, int_0 != 0, false, int_1, options, true); + if (sscanf(optimization, "do_common_optimization ( %d ) ", &int_0) == 1) { + return do_common_optimization(ir, int_0 != 0, false, options, true); } else if (strcmp(optimization, "do_algebraic") == 0) { return do_algebraic(ir, true); } else if (strcmp(optimization, "do_constant_folding") == 0) { |