KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: fix texture updates for ATI_fragment_shader 

Cc: 17.1 17.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák 2017-09-27 13:17:21 +02:00
parent 15e3657e43
commit 9d54025cd1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/main/texstate.c
View File

@ -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 */