diff options
| author | Eric Anholt <eric@anholt.net> | 2012-03-27 09:51:24 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-04-09 14:34:33 -0700 |
| commit | dcf42dbd066fe633c28afa36820da9e9430038df (patch) | |
| tree | 5fbc2c0e37108f7fa028e93836bcac82efbde572 /src/mesa/main/texstate.c | |
| parent | 18c2ee0df5fa6679996e40c574d37475be230bd7 (diff) | |
| download | external_mesa3d-dcf42dbd066fe633c28afa36820da9e9430038df.zip external_mesa3d-dcf42dbd066fe633c28afa36820da9e9430038df.tar.gz external_mesa3d-dcf42dbd066fe633c28afa36820da9e9430038df.tar.bz2 | |
mesa: Handle updating texture state for buffer textures.
We have to skip some work that wants to look at texture images, since
buffer textures don't have any of that complexity.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index ee778ff..8ca9092 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -390,6 +390,10 @@ update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit) { struct gl_tex_env_combine_state *combine; + /* No combiners will apply to this. */ + if (texUnit->_Current->Target == GL_TEXTURE_BUFFER) + return; + /* Set the texUnit->_CurrentCombine field to point to the user's combiner * state, or the combiner state which is derived from traditional texenv * mode. |