From: Eric Anholt Date: Tue, 18 Dec 2012 22:25:42 +0000 (-0800) Subject: i965: Fix hiz resolves getting stomped by depth offset validation. X-Git-Tag: android-x86-4.4-r1~2185 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c417d261ddafb5e2d83808b02e22c35457594559;p=android-x86%2Fexternal-mesa.git 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 --- diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index cb8e682d000..faa29d124fc 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 );