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 <chad@chad-versace.us>
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user