From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Sun, 19 Feb 2017 23:16:20 +0000 (+1100)
Subject: mesa: remove unused variable warning in release builds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87687afb943d26c1c82ff88b22e1d05fc3c6ed04;p=mesa.git

mesa: remove unused variable warning in release builds

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 <marek.olsak@amd.com>
---

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];