mesa: remove LowerShaderSharedVariables

always true for compute shaders

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák
2016-11-09 13:04:09 +01:00
parent 0f6360eedb
commit f500c36339
4 changed files with 1 additions and 10 deletions

View File

@@ -4678,7 +4678,7 @@ link_varyings_and_uniforms(unsigned first, unsigned last,
lower_ubo_reference(prog->_LinkedShaders[i],
options->ClampBlockIndicesToArrayBounds);
if (options->LowerShaderSharedVariables)
if (i == MESA_SHADER_COMPUTE)
lower_shared_reference(prog->_LinkedShaders[i],
&prog->Comp.SharedSize);

View File

@@ -156,8 +156,5 @@ brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo)
if (compiler->scalar_stage[MESA_SHADER_GEOMETRY])
compiler->glsl_compiler_options[MESA_SHADER_GEOMETRY].EmitNoIndirectInput = false;
compiler->glsl_compiler_options[MESA_SHADER_COMPUTE]
.LowerShaderSharedVariables = true;
return compiler;
}

View File

@@ -2938,9 +2938,6 @@ struct gl_shader_compiler_options
/** Clamp UBO and SSBO block indices so they don't go out-of-bounds. */
GLboolean ClampBlockIndicesToArrayBounds;
GLboolean LowerShaderSharedVariables; /**< Lower compute shader shared
* variable access to intrinsics. */
const struct nir_shader_compiler_options *NirOptions;
};

View File

@@ -308,9 +308,6 @@ void st_init_limits(struct pipe_screen *screen,
options->LowerCombinedClipCullDistance = true;
options->LowerBufferInterfaceBlocks = true;
if (sh == PIPE_SHADER_COMPUTE)
options->LowerShaderSharedVariables = true;
}
c->LowerTessLevel = true;