diff options
| author | Marek Olšák <[email protected]> | 2017-10-17 03:08:47 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-10-17 04:16:17 +0200 |
| commit | 5d071bf04bcf4c35452faaac253cdc9bac31f780 (patch) | |
| tree | 2b29dc06854ac8bc83d731a8603c55ae03109271 /src | |
| parent | 1b86dbc144f168efe98cc9c02dc93d4176b8aac0 (diff) | |
Revert "mesa: fix texture updates for ATI_fragment_shader"
This reverts commit 9d54025cd1eee3f42b80c062d1f644904bf2ba41.
It breaks KOTOR.
Cc: 17.1 17.2 <[email protected]>
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 */ |