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/main | |
| 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/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 15 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 91e1948c232..84a75c53cd0 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2883,14 +2883,13 @@ struct gl_shader_program #define GLSL_DUMP 0x1 /**< Dump shaders to stdout */ #define GLSL_LOG 0x2 /**< Write shaders to files */ #define GLSL_OPT 0x4 /**< Force optimizations (override pragmas) */ -#define GLSL_NO_OPT 0x8 /**< Force no optimizations (override pragmas) */ -#define GLSL_UNIFORMS 0x10 /**< Print glUniform calls */ -#define GLSL_NOP_VERT 0x20 /**< Force no-op vertex shaders */ -#define GLSL_NOP_FRAG 0x40 /**< Force no-op fragment shaders */ -#define GLSL_USE_PROG 0x80 /**< Log glUseProgram calls */ -#define GLSL_REPORT_ERRORS 0x100 /**< Print compilation errors */ -#define GLSL_DUMP_ON_ERROR 0x200 /**< Dump shaders to stderr on compile error */ -#define GLSL_CACHE_INFO 0x400 /**< Print debug information about shader cache */ +#define GLSL_UNIFORMS 0x8 /**< Print glUniform calls */ +#define GLSL_NOP_VERT 0x10 /**< Force no-op vertex shaders */ +#define GLSL_NOP_FRAG 0x20 /**< Force no-op fragment shaders */ +#define GLSL_USE_PROG 0x40 /**< Log glUseProgram calls */ +#define GLSL_REPORT_ERRORS 0x80 /**< Print compilation errors */ +#define GLSL_DUMP_ON_ERROR 0x100 /**< Dump shaders to stderr on compile error */ +#define GLSL_CACHE_INFO 0x200 /**< Print debug information about shader cache */ /** diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index ba69ede0e84..3d77448f9a5 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -83,8 +83,6 @@ _mesa_get_shader_flags(void) flags |= GLSL_NOP_VERT; if (strstr(env, "nopfrag")) flags |= GLSL_NOP_FRAG; - if (strstr(env, "nopt")) - flags |= GLSL_NO_OPT; else if (strstr(env, "opt")) flags |= GLSL_OPT; if (strstr(env, "uniform")) |