Mesa (master): i965: fix some FBO depth/stencil assertions

Brian Paul brianp at kemper.freedesktop.org
Wed Jan 14 23:52:01 UTC 2009


Module: Mesa
Branch: master
Commit: 5912cdff3e1f2296b1f5753a008b225bdac4559a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5912cdff3e1f2296b1f5753a008b225bdac4559a

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jan 14 16:26:41 2009 -0700

i965: fix some FBO depth/stencil assertions

---

 src/mesa/drivers/dri/intel/intel_depthstencil.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_depthstencil.c b/src/mesa/drivers/dri/intel/intel_depthstencil.c
index c2b4d77..f43b9ae 100644
--- a/src/mesa/drivers/dri/intel/intel_depthstencil.c
+++ b/src/mesa/drivers/dri/intel/intel_depthstencil.c
@@ -177,8 +177,11 @@ intel_validate_paired_depth_stencil(GLcontext * ctx,
       }
       else {
          /* Separate depth/stencil buffers, need to interleave now */
-         ASSERT(depthRb->Base._BaseFormat == GL_DEPTH_COMPONENT);
-         ASSERT(stencilRb->Base._BaseFormat == GL_STENCIL_INDEX);
+         ASSERT(depthRb->Base._BaseFormat == GL_DEPTH_COMPONENT ||
+                depthRb->Base._BaseFormat == GL_DEPTH_STENCIL);
+         ASSERT(stencilRb->Base._BaseFormat == GL_STENCIL_INDEX ||
+                stencilRb->Base._BaseFormat == GL_DEPTH_STENCIL);
+
          /* may need to interleave depth/stencil now */
          if (depthRb->PairedStencil == stencilRb->Base.Name) {
             /* OK, the depth and stencil buffers are already interleaved */




More information about the mesa-commit mailing list