From 87687afb943d26c1c82ff88b22e1d05fc3c6ed04 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 20 Feb 2017 10:16:20 +1100 Subject: [PATCH] mesa: remove unused variable warning in release builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This assert might have made sense before but we no longer use gl_linked_shader here. Unless the caller has really done something crazy this assert is fairly useless. We also do some small tidy ups in this change. Reviewed-by: Marek Olšák --- src/mesa/main/uniforms.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 8376a9519f6..59ae4c5dce2 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -65,18 +65,13 @@ */ void _mesa_update_shader_textures_used(struct gl_shader_program *shProg, - struct gl_program *prog) + struct gl_program *prog) { - GLbitfield mask = prog->SamplersUsed; - struct gl_linked_shader *shader = - shProg->_LinkedShaders[_mesa_program_enum_to_shader_stage(prog->Target)]; - - assert(shader); - memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed)); shProg->SamplersValidated = GL_TRUE; + GLbitfield mask = prog->SamplersUsed; while (mask) { const int s = u_bit_scan(&mask); GLuint unit = prog->SamplerUnits[s];