diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-10-05 19:25:48 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-10-11 23:16:21 +0200 |
| commit | 2991c0d7df898c6c3b5f5fdb66be07e63f8313e8 (patch) | |
| tree | 3c352305ca2f9b833506044a224a1ff7b9194ebc | |
| parent | 0e26e767d2f13397d862b9a8fb921610a721cf19 (diff) | |
st/mesa: don't assign prog->ShadowSamplers
It's not used, and the assignment for the TGSI case was incorrect
for sampler arrays.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 06a8ee8c61..5a439aaf92 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -435,7 +435,6 @@ st_nir_get_mesa_program(struct gl_context *ctx, _mesa_log("\n\n"); } - prog->ShadowSamplers = shader->shadow_samplers; prog->ExternalSamplersUsed = gl_external_samplers(prog); _mesa_update_shader_textures_used(shader_program, prog); diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 4b365c8481..1cfc9d963d 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -4475,10 +4475,6 @@ count_resources(glsl_to_tgsi_visitor *v, gl_program *prog) v->sampler_targets[idx] = st_translate_texture_target(inst->tex_target, inst->tex_shadow); - if (inst->tex_shadow) { - prog->ShadowSamplers |= 1 << (inst->resource.index + i); - } - if (inst->op == TGSI_OPCODE_TXF || inst->op == TGSI_OPCODE_TXF_LZ) { prog->TexelFetchSamplers |= 1u << idx; } |