From 52213f2cd11c6cc7210cea6896ed464fddfe3fec Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 18 Sep 2012 08:20:29 +0200
Subject: mesa git update 18 sep 2012

---
 mesalib/src/mesa/main/texobj.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/mesa/main/texobj.h')

diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index a6f1d3a14..f22c58cad 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -85,7 +85,13 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
 static inline GLuint
 _mesa_num_tex_faces(GLenum target)
 {
-   return target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+   switch (target) {
+   case GL_TEXTURE_CUBE_MAP:
+   case GL_PROXY_TEXTURE_CUBE_MAP:
+      return 6;
+   default:
+      return 1;
+   }
 }
 
 
-- 
cgit v1.2.3