From: Brian Paul <brianp@vmware.com>
Date: Sat, 24 Oct 2009 00:21:59 +0000 (-0600)
Subject: mesa: remove FBO texture depth/stencil test
X-Git-Tag: mesa-7.8~2464^2~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc8b139aa23899b00baa919fd7f46c74bf4ef205;p=platform%2Fupstream%2Fmesa.git

mesa: remove FBO texture depth/stencil test

The texture format should not be checked until validation time since
the format might be changed by a subsequent glTexImage() call.
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 825a230..ed1db0f 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1511,18 +1511,6 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
       return;
    }
 
-   if (texObj && attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-      /* the texture format must be depth+stencil */
-      const struct gl_texture_image *texImg;
-      texImg = texObj->Image[0][texObj->BaseLevel];
-      if (!texImg || texImg->_BaseFormat != GL_DEPTH_STENCIL) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glFramebufferTexture%sEXT(texture is not"
-                     " DEPTH_STENCIL format)", caller);
-         return;
-      }
-   }
-
    FLUSH_CURRENT(ctx, _NEW_BUFFERS);
    /* The above doesn't fully flush the drivers in the way that a
     * glFlush does, but that is required here: