diff options
| author | Chad Versace <[email protected]> | 2011-10-07 10:26:12 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2011-10-07 10:33:51 -0700 |
| commit | 53f858637319f0efa47dd9acdb547e7913f3f86b (patch) | |
| tree | ea9aff7b00031014d4a7540cca2fc77dbcdeaf32 | |
| parent | 793d29d6d3fd0df72aabe4648bf6814ec2d4aecd (diff) | |
i915,i830: Remove dead HiZ assertions in *update_draw_buffer()
i915 and i830 hardware doesn't have HiZ, so remove all HiZ related
assertions from *update_draw_buffer().
I've removed the dead format checks completely rather than replace them
with more appropriate checks. This doesn't reduce "assertion coverage",
however, because when I added these HiZ related assertions in c8fdf66
there were no pre-existing checks there.
Signed-off-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_vtbl.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_vtbl.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c index 7810f56a7a2..e8045e3691b 100644 --- a/src/mesa/drivers/dri/i915/i830_vtbl.c +++ b/src/mesa/drivers/dri/i915/i830_vtbl.c @@ -715,7 +715,6 @@ i830_update_draw_buffer(struct intel_context *intel) struct gl_framebuffer *fb = ctx->DrawBuffer; struct intel_region *colorRegions[MAX_DRAW_BUFFERS], *depthRegion = NULL; struct intel_renderbuffer *irbDepth = NULL, *irbStencil = NULL; - bool fb_has_hiz = intel_framebuffer_has_hiz(fb); if (!fb) { /* this can happen during the initial context initialization */ @@ -792,7 +791,6 @@ i830_update_draw_buffer(struct intel_context *intel) /* Check for depth fallback. */ if (irbDepth && irbDepth->region) { - assert(!fb_has_hiz || irbDepth->Base.Format != MESA_FORMAT_S8_Z24); FALLBACK(intel, INTEL_FALLBACK_DEPTH_BUFFER, GL_FALSE); depthRegion = irbDepth->region; } else if (irbDepth && !irbDepth->region) { diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index 1e84c6d7d0e..e09c7878d0f 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -715,7 +715,6 @@ i915_update_draw_buffer(struct intel_context *intel) struct gl_framebuffer *fb = ctx->DrawBuffer; struct intel_region *colorRegion = NULL, *depthRegion = NULL; struct intel_renderbuffer *irbDepth = NULL, *irbStencil = NULL; - bool fb_has_hiz = intel_framebuffer_has_hiz(fb); if (!fb) { /* this can happen during the initial context initialization */ @@ -762,7 +761,6 @@ i915_update_draw_buffer(struct intel_context *intel) /* Check for depth fallback. */ if (irbDepth && irbDepth->region) { - assert(!fb_has_hiz || irbDepth->Base.Format != MESA_FORMAT_S8_Z24); FALLBACK(intel, INTEL_FALLBACK_DEPTH_BUFFER, GL_FALSE); depthRegion = irbDepth->region; } else if (irbDepth && !irbDepth->region) { |