Mesa (mesa_7_6_branch): mesa: remove FBO texture depth/stencil test

Brian Paul brianp at kemper.freedesktop.org
Sat Oct 24 00:37:01 UTC 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: dc8b139aa23899b00baa919fd7f46c74bf4ef205
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc8b139aa23899b00baa919fd7f46c74bf4ef205

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Oct 23 18:21:59 2009 -0600

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.

---

 src/mesa/main/fbobject.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

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:




More information about the mesa-commit mailing list