mesa: remove MESA_GLSL=opt

This is unused.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emli.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html
index ada1e3850d4016caa9a1d96bd56234b42834ae2b..b1d4aa011a985b54855b7571318a7647cd79b20c 100644 (file)
--- 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 &gt;= 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 cd01af00d90444c164413bb87bc3cad6512a18da..7e3d2e4fced0756509f861e4665fb6922c6039bb 100644 (file)
--- 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 84a75c53cd07fcb9282ba99e65b75ccbc759215d..401c35a31b708053b9eafb66ad79b1f550495ab4 100644 (file)
--- 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 3d77448f9a5327fea33e0102f5439f6f0aee8bd0..187475f1277bcea9994ee1ec59f71173804d35ed 100644 (file)
--- 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"))