diff options
| -rw-r--r-- | docs/relnotes/17.1.0.html | 1 | ||||
| -rw-r--r-- | docs/shading.html | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 15 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html index ada1e3850d..b1d4aa011a 100644 --- a/docs/relnotes/17.1.0.html +++ b/docs/relnotes/17.1.0.html @@ -62,6 +62,7 @@ Note: some of the new features are only available with certain drivers. <li>The configure option --enable-gallium-llvm is superseded by --enable-llvm.</li> <li>The swr driver now requires LLVM >= 3.9.0.</li> <li>The radeonsi driver now requires LLVM 3.8.0.</li> +<li>The MESA_GLSL=opt and MESA_GLSL=no_opt environment vars have been removed.</li> </ul> </div> diff --git a/docs/shading.html b/docs/shading.html index cd01af00d9..7e3d2e4fce 100644 --- a/docs/shading.html +++ b/docs/shading.html @@ -50,7 +50,6 @@ execution. These are generally used for debugging. The filenames will be "shader_X.vert" or "shader_X.frag" where X the shader ID. <li><b>cache_info</b> - print debug information about shader cache -<li><b>opt</b> - force compiler optimizations <li><b>uniform</b> - print message to stdout when glUniform is called <li><b>nopvert</b> - force vertex shaders to be a simple shader that just transforms the vertex position with ftransform() and passes through the color and diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 84a75c53cd..401c35a31b 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 3d77448f9a..187475f127 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")) |