From 5d071bf04bcf4c35452faaac253cdc9bac31f780 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 17 Oct 2017 03:08:47 +0200 Subject: [PATCH] Revert "mesa: fix texture updates for ATI_fragment_shader" This reverts commit 9d54025cd1eee3f42b80c062d1f644904bf2ba41. It breaks KOTOR. Cc: 17.1 17.2 --- src/mesa/main/texstate.c | 8 +++----- 1 file 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 */ -- 2.30.2