mesa: Return 0 for cube map face of non-cubemap framebuffer attachments.

Fixes some oglconform fbo testcases.

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 8e9948cb45d330cd7f90de38c68008a2d0197e46..cecc89ac38d0c0b7636594bb741d7a7ef1747773 100644 (file)
--- 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,