[Mesa-dev] [PATCH 4/4] mesa: remove MESA_GLSL=opt

[Nicolai Hähnle]

On 30.03.2017 13:26, Timothy Arceri wrote:
> This is unused.
> ---
>  docs/shading.html         |  1 -
>  src/mesa/main/mtypes.h    | 15 +++++++--------
>  src/mesa/main/shaderapi.c |  2 --
>  3 files changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/docs/shading.html b/docs/shading.html
> index cd01af0..7e3d2e4 100644
> --- a/docs/shading.html
> +++ b/docs/shading.html
> @@ -43,21 +43,20 @@ Contents
>  The <b>MESA_GLSL</b> environment variable can be set to a comma-separated
>  list of keywords to control some aspects of the GLSL compiler and shader
>  execution.  These are generally used for debugging.
>  </p>
>  <ul>
>  <li><b>dump</b> - print GLSL shader code to stdout at link time
>  <li><b>log</b> - log all GLSL shaders to files.
>      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
>      texcoord[0] attributes.
>  <li><b>nopfrag</b> - force fragment shader to be a simple shader that passes
>      through the color attribute.
>  <li><b>useprog</b> - log glUseProgram calls to stderr
>  </ul>
>  <p>
>  Example:  export MESA_GLSL=dump,nopt
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index daccb2b..e4c6771 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -2876,28 +2876,27 @@ struct gl_shader_program
>
>     /* True if any of the fragment shaders attached to this program use:
>      * #extension ARB_fragment_coord_conventions: enable
>      */
>     GLboolean ARB_fragment_coord_conventions_enable;
>  };
>
>
>  #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 */

I think it's nicer to just leave a gap (clearly marked with a comment) 
to reduce noise in the diffs. Just something to keep in mind for the future.

The series is

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


>
>
>  /**
>   * Context state for GLSL vertex/fragment shaders.
>   * Extended to support pipeline object
>   */
>  struct gl_pipeline_object
>  {
>     /** Name of the pipeline object as received from glGenProgramPipelines.
>      * It would be 0 for shaders without separate shader objects.
> diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
> index 3d77448..187475f 100644
> --- a/src/mesa/main/shaderapi.c
> +++ b/src/mesa/main/shaderapi.c
> @@ -76,22 +76,20 @@ _mesa_get_shader_flags(void)
>        else if (strstr(env, "dump"))
>           flags |= GLSL_DUMP;
>        if (strstr(env, "log"))
>           flags |= GLSL_LOG;
>        if (strstr(env, "cache_info"))
>           flags |= GLSL_CACHE_INFO;
>        if (strstr(env, "nopvert"))
>           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"))
>           flags |= GLSL_USE_PROG;
>        if (strstr(env, "errors"))
>           flags |= GLSL_REPORT_ERRORS;
>     }
>
>     return flags;
>  }
>


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.