Mesa (master): mesa: fix cubemap depth completeness test

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 863554168ef34ecb7b72650ced78cc9aed923691
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=863554168ef34ecb7b72650ced78cc9aed923691

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jan 10 16:11:58 2012 +0000

mesa: fix cubemap depth completeness test

This fixes the test to allow cube/depth combinations on GL3
or EXT_gpu_shader4.

Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/texobj.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 7ee2005..dc6e309 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -672,9 +672,11 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
 		     return;
 		  }
 		  /* Don't support GL_DEPTH_COMPONENT for cube maps */
-		  if (t->Image[face][i]->_BaseFormat == GL_DEPTH_COMPONENT) {
-		     incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
-		     return;
+                  if (ctx->VersionMajor < 3 && !ctx->Extensions.EXT_gpu_shader4) {
+                     if (t->Image[face][i]->_BaseFormat == GL_DEPTH_COMPONENT) {
+                        incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
+                        return;
+                     }
 		  }
 		  /* check that all six images have same size */
                   if (t->Image[face][i]->Width2 != width ||