diff options
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 84a75c53cd0..401c35a31b7 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2882,14 +2882,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_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 */ +#define GLSL_UNIFORMS 0x4 /**< Print glUniform calls */ +#define GLSL_NOP_VERT 0x8 /**< Force no-op vertex shaders */ +#define GLSL_NOP_FRAG 0x10 /**< Force no-op fragment shaders */ +#define GLSL_USE_PROG 0x20 /**< Log glUseProgram calls */ +#define GLSL_REPORT_ERRORS 0x40 /**< Print compilation errors */ +#define GLSL_DUMP_ON_ERROR 0x80 /**< Dump shaders to stderr on compile error */ +#define GLSL_CACHE_INFO 0x100 /**< Print debug information about shader cache */ /** diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 3d77448f9a5..187475f1277 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; - else if (strstr(env, "opt")) - flags |= GLSL_OPT; if (strstr(env, "uniform")) flags |= GLSL_UNIFORMS; if (strstr(env, "useprog")) |