From e5022c3fdf9888857f22f9a1690035ff3f90d36b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 25 Jul 2008 12:40:16 -0700
Subject: mesa: Return 0 for cube map face of non-cubemap framebuffer
 attachments.

Fixes some oglconform fbo testcases.
---
 src/mesa/main/fbobject.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 8e9948cb45..cecc89ac38 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1493,7 +1493,10 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
       return;
    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
       if (att->Type == GL_TEXTURE) {
-	 *params = GL_TEXTURE_CUBE_MAP_POSITIVE_X + att->CubeMapFace;
+	 if (att->Texture->Target == GL_TEXTURE_CUBE_MAP)
+	    *params = GL_TEXTURE_CUBE_MAP_POSITIVE_X + att->CubeMapFace;
+	 else
+	    *params = 0;
       }
       else {
 	 _mesa_error(ctx, GL_INVALID_ENUM,
-- 
cgit v1.2.3