Mesa (master): i965: Fix hiz resolves getting stomped by depth offset validation.
Eric Anholt
anholt at kemper.freedesktop.org
Sun Dec 23 00:05:38 UTC 2012
Module: Mesa
Branch: master
Commit: c417d261ddafb5e2d83808b02e22c35457594559
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c417d261ddafb5e2d83808b02e22c35457594559
Author: Eric Anholt <eric at anholt.net>
Date: Tue Dec 18 14:25:42 2012 -0800
i965: Fix hiz resolves getting stomped by depth offset validation.
Fixes all the remaining non-Z32F_S8 depthstencil-render-miplevels tests
in piglit.
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
---
src/mesa/drivers/dri/i965/brw_draw.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index cb8e682..faa29d1 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -436,17 +436,17 @@ static bool brw_try_draw_prims( struct gl_context *ctx,
intel_prepare_render(intel);
+ /* This workaround has to happen outside of brw_state_upload() because it
+ * may flush the batchbuffer for a blit, affecting the state flags.
+ */
+ brw_workaround_depthstencil_alignment(brw);
+
/* Resolves must occur after updating renderbuffers, updating context state,
* and finalizing textures but before setting up any hardware state for
* this draw call.
*/
brw_predraw_resolve_buffers(brw);
- /* This workaround has to happen outside of brw_state_upload() because it
- * may flush the batchbuffer for a blit, affecting the state flags.
- */
- brw_workaround_depthstencil_alignment(brw);
-
/* Bind all inputs, derive varying and size information:
*/
brw_merge_inputs( brw, arrays );
More information about the mesa-commit
mailing list