From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 23 May 2011 18:24:43 +0000 (-0700)
Subject: i965/gen7: Remove stencil renderbuffer from gen7_depth_format.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd265201da44093ce9c583fe04aa7db94f61453c;p=mesa.git

i965/gen7: Remove stencil renderbuffer from gen7_depth_format.

Since Gen7 doesn't support packed depth/stencil, the stencil buffer
can't possibly be relevant for determining the depth format.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/gen7_misc_state.c b/src/mesa/drivers/dri/i965/gen7_misc_state.c
index a180b678c11..8d5fc70f098 100644
--- a/src/mesa/drivers/dri/i965/gen7_misc_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_misc_state.c
@@ -35,13 +35,10 @@ gen7_depth_format(struct brw_context *brw)
    struct gl_context *ctx = &intel->ctx;
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    struct intel_renderbuffer *drb = intel_get_renderbuffer(fb, BUFFER_DEPTH);
-   struct intel_renderbuffer *srb = intel_get_renderbuffer(fb, BUFFER_STENCIL);
    struct intel_region *region = NULL;
 
    if (drb)
       region = drb->region;
-   else if (srb)
-      region = srb->region;
    else
       return BRW_DEPTHFORMAT_D32_FLOAT;