diff options
| author | Timothy Arceri <[email protected]> | 2017-03-30 22:14:21 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-03-31 13:43:38 +1100 |
| commit | 2caa3aa1f4fed5fd336dbbdb77eeb2e29730a204 (patch) | |
| tree | bd2db62d3bbc4f448c64e6469b172cdca11315c0 /src/mesa/program | |
| parent | 94224950ddb609bfbee1ffb0ca3621c0bda6101f (diff) | |
mesa: remove MESA_GLSL=no_opts env option
This is confusing because is only applys to GL_ARB_vertex/fragment_program,
and because of that its also not very useful.
If someone requires this for debugging they can just make an ad-hoc
code change.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/arbprogparse.c | 3 | ||||
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c index 9b843f628c1..07bdf1603ef 100644 --- a/src/mesa/program/arbprogparse.c +++ b/src/mesa/program/arbprogparse.c @@ -180,8 +180,7 @@ _mesa_parse_arb_vertex_program(struct gl_context *ctx, GLenum target, return; } - if ((ctx->_Shader->Flags & GLSL_NO_OPT) == 0) - _mesa_optimize_program(ctx, &prog, program); + _mesa_optimize_program(ctx, &prog, program); ralloc_free(program->String); diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 3898cb8d09a..a2476ddbf58 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2979,9 +2979,7 @@ get_mesa_program(struct gl_context *ctx, prog->info.fs.depth_layout = shader_program->FragDepthLayout; } - if ((ctx->_Shader->Flags & GLSL_NO_OPT) == 0) { - _mesa_optimize_program(ctx, prog, prog); - } + _mesa_optimize_program(ctx, prog, prog); /* This has to be done last. Any operation that can cause * prog->ParameterValues to get reallocated (e.g., anything that adds a |