From: Francisco Jerez <currojerez@riseup.net>
Date: Sat, 30 Oct 2010 14:32:00 +0000 (+0200)
Subject: meta: Don't try to disable cube maps if the driver doesn't expose the extension.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8eaa97592a4330d1a253f6fa32df7a3fd04f53ae;p=mesa.git

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

Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 6433c89d813..b154a6df959 100644
--- 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);