From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 9 Jun 2017 21:54:16 +0000 (+0200)
Subject: mesa: simplify a loop in _mesa_update_texture_state
X-Git-Tag: upstream/18.1.0~8559
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc4e914f959efe61edc47f2b159bed527808475b;p=platform%2Fupstream%2Fmesa.git

mesa: simplify a loop in _mesa_update_texture_state

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 1e90bf8..0a2883f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -840,13 +840,7 @@ _mesa_update_texture_state(struct gl_context *ctx)
    int old_max_unit = ctx->Texture._MaxEnabledTexImageUnit;
    BITSET_DECLARE(enabled_texture_units, MAX_COMBINED_TEXTURE_IMAGE_UNITS);
 
-   for (i = 0; i < MESA_SHADER_STAGES; i++) {
-      if (ctx->_Shader->CurrentProgram[i]) {
-         prog[i] = ctx->_Shader->CurrentProgram[i];
-      } else {
-         prog[i] = NULL;
-      }
-   }
+   memcpy(prog, ctx->_Shader->CurrentProgram, sizeof(prog));
 
    if (prog[MESA_SHADER_FRAGMENT] == NULL &&
        _mesa_arb_fragment_program_enabled(ctx)) {