diff options
| author | Eric Anholt <[email protected]> | 2013-01-08 09:56:24 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-01-18 13:03:41 -0800 |
| commit | 078727d41c1f1578704c830fce062bd0538802ab (patch) | |
| tree | a2a75e504bdcbd8e1ee9c6c4525ede5dacb0231c /src/mesa | |
| parent | b5788146bac2b9da48cacad758dbe7868503cf76 (diff) | |
mesa: Don't bother updating ff texture state if we have a fragment shader.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 3adea542f57..a2541fc9f1c 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -618,7 +618,8 @@ update_texture_state( struct gl_context *ctx ) if (enabledFragTargets) enabledFragUnits |= (1 << unit); - update_tex_combine(ctx, texUnit); + if (!fprog) + update_tex_combine(ctx, texUnit); } |