Mesa (arb_fbo): intel: remove/disable the "paired depth/stencil" code

[Brian Paul]

Module: Mesa
Branch: arb_fbo
Commit: 0e20b68fa63a2f1a4b2d7fe7f27b09a56963e8f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e20b68fa63a2f1a4b2d7fe7f27b09a56963e8f7

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 22 13:54:57 2009 -0700

intel: remove/disable the "paired depth/stencil" code

We only allow combined depth+stencil renderbuffers so the complicated code
for splitting and combining separate depth and stencil buffers is no longer
needed.

---

 src/mesa/drivers/dri/i915/Makefile         |    3 +--
 src/mesa/drivers/dri/i965/Makefile         |    1 -
 src/mesa/drivers/dri/intel/intel_buffers.c |    3 ---
 src/mesa/drivers/dri/intel/intel_fbo.c     |    4 ----
 src/mesa/drivers/dri/intel/intel_fbo.h     |    3 ---
 5 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/Makefile b/src/mesa/drivers/dri/i915/Makefile
index 5858e0e..5652f9e 100644
--- a/src/mesa/drivers/dri/i915/Makefile
+++ b/src/mesa/drivers/dri/i915/Makefile
@@ -50,8 +50,7 @@ DRIVER_SOURCES = \
 	intel_span.c \
 	intel_state.c \
 	intel_tris.c \
-	intel_fbo.c \
-	intel_depthstencil.c
+	intel_fbo.c
 
 C_SOURCES = \
 	$(COMMON_SOURCES) \
diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile
index 37a470f..f134d68 100644
--- a/src/mesa/drivers/dri/i965/Makefile
+++ b/src/mesa/drivers/dri/i965/Makefile
@@ -11,7 +11,6 @@ DRIVER_SOURCES = \
 	intel_buffers.c \
 	intel_context.c \
 	intel_decode.c \
-	intel_depthstencil.c \
 	intel_fbo.c \
 	intel_mipmap_tree.c \
 	intel_regions.c \
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
index f0acf8b..cd72818 100644
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
@@ -836,9 +836,6 @@ intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb)
       return;
    }
 
-   if (fb->Name)
-      intel_validate_paired_depth_stencil(ctx, fb);
-
    /*
     * How many color buffers are we drawing into?
     */
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 9d7e3c3..6b13e37 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -106,10 +106,6 @@ intel_delete_renderbuffer(struct gl_renderbuffer *rb)
 
    ASSERT(irb);
 
-   if (irb->PairedStencil || irb->PairedDepth) {
-      intel_unpair_depth_stencil(ctx, irb);
-   }
-
    if (irb->span_cache != NULL)
       _mesa_free(irb->span_cache);
 
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.h b/src/mesa/drivers/dri/intel/intel_fbo.h
index 3fe3a8f..4741700 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.h
+++ b/src/mesa/drivers/dri/intel/intel_fbo.h
@@ -73,9 +73,6 @@ struct intel_renderbuffer
    GLuint pfPitch;              /* possibly paged flipped pitch */
    GLboolean RenderToTexture;   /* RTT? */
 
-   GLuint PairedDepth;   /**< only used if this is a depth renderbuffer */
-   GLuint PairedStencil; /**< only used if this is a stencil renderbuffer */
-
    GLuint pf_pending;  /**< sequence number of pending flip */
 
    GLuint vbl_pending;   /**< vblank sequence number of pending flip */