From d1c1544a49e98431a7cab3d5fe89ac2ddbe4008d Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 4 Apr 2017 12:39:31 +1000 Subject: [PATCH] mesa: small texstate tidy up MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Possibly more efficient, either way it makes the code easier to follow. Reviewed-by: Brian Paul Reviewed-by: Nicolai Hähnle --- src/mesa/main/texstate.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index ada0dfdb660..aa99b0667cb 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -704,13 +704,14 @@ _mesa_update_texture_state(struct gl_context *ctx) if (ctx->_Shader->CurrentProgram[i]) { prog[i] = ctx->_Shader->CurrentProgram[i]; } else { - if (i == MESA_SHADER_FRAGMENT && ctx->FragmentProgram._Enabled) - prog[i] = ctx->FragmentProgram.Current; - else - prog[i] = NULL; + prog[i] = NULL; } } + if (prog[MESA_SHADER_FRAGMENT] == NULL && ctx->FragmentProgram._Enabled) { + prog[MESA_SHADER_FRAGMENT] = ctx->FragmentProgram.Current; + } + /* TODO: only set this if there are actual changes */ ctx->NewState |= _NEW_TEXTURE_OBJECT | _NEW_TEXTURE_STATE; -- 2.30.2