Module: Mesa Branch: master Commit: 9d54025cd1eee3f42b80c062d1f644904bf2ba41 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d54025cd1eee3f42b80c062d1f644904bf2ba41
Author: Marek Olšák <[email protected]> Date: Wed Sep 27 13:17:21 2017 +0200 mesa: fix texture updates for ATI_fragment_shader Cc: 17.1 17.2 <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> --- src/mesa/main/texstate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 269e29194d..edd2253731 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -840,9 +840,11 @@ _mesa_update_texture_state(struct gl_context *ctx) memcpy(prog, ctx->_Shader->CurrentProgram, sizeof(prog)); - if (prog[MESA_SHADER_FRAGMENT] == NULL && - _mesa_arb_fragment_program_enabled(ctx)) { - prog[MESA_SHADER_FRAGMENT] = ctx->FragmentProgram.Current; + 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; } /* TODO: only set this if there are actual changes */ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
