diff options
author | Kenneth Graunke <[email protected]> | 2015-03-06 00:43:28 -0800 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2015-03-08 20:03:46 -0700 |
commit | a55da73be46b4576015417b2dff71a719bc8b797 (patch) | |
tree | 1d868c00aa56924317eef799030d578d45c0496b /src/glsl/opt_constant_variable.cpp | |
parent | 2561aea6b306c4438defeb4ec96be05f6aadd12e (diff) |
nir: Try to make sense of the nir_shader_compiler_options code.
The code in glsl_to_nir is entirely dead, as we translate from GLSL to
NIR at link time, when there isn't a _mesa_glsl_parse_state to pass,
so every caller passes NULL.
glsl_to_nir seems like the wrong place to try and create the shader
compiler options structure anyway - tgsi_to_nir, prog_to_nir, and other
translators all would have to duplicate that code. The driver should
set this up once with whatever settings it wants, and pass it in.
Eric also added a NirOptions field to ctx->Const.ShaderCompilerOptions[]
and left a comment saying: "The memory for the options is expected to be
kept in a single static copy by the driver." This suggests the plan was
to do exactly that. That pointer was not marked const, however, and the
dead code used a mix of static structures and ralloced ones.
This patch deletes the dead code in glsl_to_nir, instead making it take
the shader compiler options as a mandatory argument. It creates an
(empty) options struct in the i965 driver, and makes NirOptions point
to that. It marks the pointer const so that we can actually do so
without generating "discards const qualifier" compiler warnings.
Signed-off-by: Kenneth Graunke <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/glsl/opt_constant_variable.cpp')
0 files changed, 0 insertions, 0 deletions