Mesa (7.9): meta: Don't try to disable cube maps if the driver doesn' t expose the extension.

[Ian Romanick]

Module: Mesa
Branch: 7.9
Commit: 4c1db8c7a4ac1e6ef634fc02dbb9b34a7301ea25
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c1db8c7a4ac1e6ef634fc02dbb9b34a7301ea25

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sat Oct 30 16:32:00 2010 +0200

meta: Don't try to disable cube maps if the driver doesn't expose the extension.

Signed-off-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 8eaa97592a4330d1a253f6fa32df7a3fd04f53ae)

---

 src/mesa/drivers/common/meta.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 29cbe90..57b4b65 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -478,7 +478,8 @@ _mesa_meta_begin(GLcontext *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);