projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e64c22
)
meta: Don't try to disable cube maps if the driver doesn't expose the extension.
author
Francisco Jerez
<currojerez@riseup.net>
Sat, 30 Oct 2010 14:32:00 +0000
(16:32 +0200)
committer
Francisco Jerez
<currojerez@riseup.net>
Sat, 6 Nov 2010 01:40:21 +0000
(
02:40
+0100)
Signed-off-by: Brian Paul <brianp@vmware.com>
src/mesa/drivers/common/meta.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/common/meta.c
b/src/mesa/drivers/common/meta.c
index 6433c89d8138a8332e6422cc8035364b19d723a6..b154a6df959d69eee7482fe96e5e7ce90667e6c1 100644
(file)
--- a/
src/mesa/drivers/common/meta.c
+++ b/
src/mesa/drivers/common/meta.c
@@
-478,7
+478,8
@@
_mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_set_enable(ctx, GL_TEXTURE_1D, GL_FALSE);
_mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE);
_mesa_set_enable(ctx, GL_TEXTURE_3D, GL_FALSE);
- _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
+ if (ctx->Extensions.ARB_texture_cube_map)
+ _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
_mesa_set_enable(ctx, GL_TEXTURE_RECTANGLE, GL_FALSE);
_mesa_set_enable(ctx, GL_TEXTURE_GEN_S, GL_FALSE);
_mesa_set_enable(ctx, GL_TEXTURE_GEN_T, GL_FALSE);