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

Revert "mesa: fix texture updates for ATI_fragment_shader"

Browse Source 
This reverts commit 9d54025cd1.

It breaks KOTOR.

Cc: 17.1 17.2 <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Marek Olšák
2017-10-17 03:08:47 +02:00
parent 1b86dbc144
commit 5d071bf04b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/texstate.c
+3 -5
View File
@@ -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 */