From: Eric Engestrom <eric.engestrom@intel.com>
Date: Sat, 22 Jun 2019 17:18:40 +0000 (+0100)
Subject: mesa: drop MAYBE_UNUSED var
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bac5760e7b6249db9405142a175b1be6597a4ea0;p=mesa.git

mesa: drop MAYBE_UNUSED var

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 116fab21cb9..3cbc7ada445 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -103,11 +103,9 @@ _mesa_update_shader_textures_used(struct gl_shader_program *shProg,
    GLbitfield mask = prog->SamplersUsed;
    gl_shader_stage prog_stage =
       _mesa_program_enum_to_shader_stage(prog->Target);
-   MAYBE_UNUSED struct gl_linked_shader *shader =
-      shProg->_LinkedShaders[prog_stage];
    GLuint s;
 
-   assert(shader);
+   assert(shProg->_LinkedShaders[prog_stage]);
 
    memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));