diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/main/texstate.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 776806d6326..2146723d086 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -838,11 +838,9 @@ _mesa_update_texture_state(struct gl_context *ctx) memcpy(prog, ctx->_Shader->CurrentProgram, sizeof(prog)); - if (prog[MESA_SHADER_FRAGMENT] == NULL) { - if (_mesa_arb_fragment_program_enabled(ctx)) - prog[MESA_SHADER_FRAGMENT] = ctx->FragmentProgram.Current; - else if (_mesa_ati_fragment_shader_enabled(ctx)) - prog[MESA_SHADER_FRAGMENT] = ctx->ATIFragmentShader.Current->Program; + if (prog[MESA_SHADER_FRAGMENT] == NULL && + _mesa_arb_fragment_program_enabled(ctx)) { + prog[MESA_SHADER_FRAGMENT] = ctx->FragmentProgram.Current; } /* TODO: only set this if there are actual changes */ |