From: Chad Versace Date: Mon, 23 May 2011 20:48:28 +0000 (-0700) Subject: i965/brw: Emit state for hiz and separate stencil buffers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2abc8cae87b4cd037ebde68b4b9a1d02254657df;p=mesa.git i965/brw: Emit state for hiz and separate stencil buffers When emitting 3DSTATE_DEPTH_BUFFER, also emit 3DSTATE_HIER_DEPTH_BUFFER if there is a hiz buffer. Ditto for 3DSTATE_STENCIL_BUFFER and a separate stencil buffer. Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke Signed-off-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 3ec90096212..4256234a645 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -202,6 +202,8 @@ static void prepare_depthbuffer(struct brw_context *brw) if (drb) brw_add_validated_bo(brw, drb->region->buffer); + if (drb && drb->hiz_region) + brw_add_validated_bo(brw, drb->hiz_region->buffer); if (srb) brw_add_validated_bo(brw, srb->region->buffer); } @@ -212,14 +214,28 @@ static void emit_depthbuffer(struct brw_context *brw) struct gl_context *ctx = &intel->ctx; struct gl_framebuffer *fb = ctx->DrawBuffer; /* _NEW_BUFFERS */ - struct intel_renderbuffer *irb = intel_get_renderbuffer(fb, BUFFER_DEPTH); + struct intel_renderbuffer *depth_irb = intel_get_renderbuffer(fb, BUFFER_DEPTH); + struct intel_renderbuffer *stencil_irb = intel_get_renderbuffer(fb, BUFFER_STENCIL); + struct intel_region *hiz_region = depth_irb ? depth_irb->hiz_region : NULL; unsigned int len; - /* If we're combined depth stencil but no depth is attached, look - * up stencil. + /* + * If depth and stencil buffers are identical, then don't use separate + * stencil. */ - if (!irb) - irb = intel_get_renderbuffer(fb, BUFFER_STENCIL); + if (depth_irb && depth_irb == stencil_irb) { + stencil_irb = NULL; + } + + /* + * If stencil buffer uses combined depth/stencil format, but no depth buffer + * is attached, then use stencil buffer as depth buffer. + */ + if (!depth_irb && stencil_irb + && stencil_irb->Base.Format == MESA_FORMAT_S8_Z24) { + depth_irb = stencil_irb; + stencil_irb = NULL; + } if (intel->gen >= 6) len = 7; @@ -228,7 +244,7 @@ static void emit_depthbuffer(struct brw_context *brw) else len = 5; - if (!irb) { + if (!depth_irb && !stencil_irb) { BEGIN_BATCH(len); OUT_BATCH(_3DSTATE_DEPTH_BUFFER << 16 | (len - 2)); OUT_BATCH((BRW_DEPTHFORMAT_D32_FLOAT << 18) | @@ -244,11 +260,57 @@ static void emit_depthbuffer(struct brw_context *brw) OUT_BATCH(0); ADVANCE_BATCH(); + + } else if (!depth_irb && stencil_irb) { + /* + * There exists a separate stencil buffer but no depth buffer. + * + * The stencil buffer inherits most of its fields from + * 3DSTATE_DEPTH_BUFFER: namely the tile walk, surface type, width, and + * height. + * + * Since the stencil buffer has quirky pitch requirements, its region + * was allocated with half height and double cpp. So we need + * a multiplier of 2 to obtain the surface's real height. + * + * Enable the hiz bit because it and the separate stencil bit must have + * the same value. From Section 2.11.5.6.1.1 3DSTATE_DEPTH_BUFFER, Bit + * 1.21 "Separate Stencil Enable": + * [DevIL]: If this field is enabled, Hierarchical Depth Buffer + * Enable must also be enabled. + * + * [DevGT]: This field must be set to the same value (enabled or + * disabled) as Hierarchical Depth Buffer Enable + */ + assert(intel->has_separate_stencil); + assert(stencil_irb->Base.Format == MESA_FORMAT_S8); + + BEGIN_BATCH(len); + OUT_BATCH(_3DSTATE_DEPTH_BUFFER << 16 | (len - 2)); + OUT_BATCH((BRW_DEPTHFORMAT_D32_FLOAT << 18) | + (1 << 21) | /* separate stencil enable */ + (1 << 22) | /* hiz enable */ + (BRW_TILEWALK_YMAJOR << 26) | + (BRW_SURFACE_2D << 29)); + OUT_BATCH(0); + OUT_BATCH(((stencil_irb->region->width - 1) << 6) | + (2 * stencil_irb->region->height - 1) << 19); + OUT_BATCH(0); + OUT_BATCH(0); + + if (intel->gen >= 6) + OUT_BATCH(0); + + ADVANCE_BATCH(); + } else { - struct intel_region *region = irb->region; + struct intel_region *region = depth_irb->region; unsigned int format; uint32_t tile_x, tile_y, offset; + /* If using separate stencil, hiz must be enabled. */ + assert(!stencil_irb || hiz_region); + switch (region->cpp) { case 2: format = BRW_DEPTHFORMAT_D16_UNORM; @@ -256,6 +318,8 @@ static void emit_depthbuffer(struct brw_context *brw) case 4: if (intel->depth_buffer_is_float) format = BRW_DEPTHFORMAT_D32_FLOAT; + else if (hiz_region) + format = BRW_DEPTHFORMAT_D24_UNORM_X8_UINT; else format = BRW_DEPTHFORMAT_D24_UNORM_S8_UINT; break; @@ -267,11 +331,14 @@ static void emit_depthbuffer(struct brw_context *brw) offset = intel_region_tile_offsets(region, &tile_x, &tile_y); assert(intel->gen < 6 || region->tiling == I915_TILING_Y); + assert(!hiz_region || region->tiling == I915_TILING_Y); BEGIN_BATCH(len); OUT_BATCH(_3DSTATE_DEPTH_BUFFER << 16 | (len - 2)); OUT_BATCH(((region->pitch * region->cpp) - 1) | (format << 18) | + ((hiz_region ? 1 : 0) << 21) | /* separate stencil enable */ + ((hiz_region ? 1 : 0) << 22) | /* hiz enable */ (BRW_TILEWALK_YMAJOR << 26) | ((region->tiling != I915_TILING_NONE) << 27) | (BRW_SURFACE_2D << 29)); @@ -294,8 +361,37 @@ static void emit_depthbuffer(struct brw_context *brw) ADVANCE_BATCH(); } - /* Initialize it for safety. */ - if (intel->gen >= 6) { + /* Emit hiz buffer. */ + if (hiz_region || stencil_irb) { + BEGIN_BATCH(3); + OUT_BATCH((_3DSTATE_HIER_DEPTH_BUFFER << 16) | (3 - 2)); + OUT_BATCH(hiz_region->pitch * hiz_region->cpp - 1); + OUT_RELOC(hiz_region->buffer, + I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, + 0); + ADVANCE_BATCH(); + } + + /* Emit stencil buffer. */ + if (hiz_region || stencil_irb) { + BEGIN_BATCH(3); + OUT_BATCH((_3DSTATE_STENCIL_BUFFER << 16) | (3 - 2)); + OUT_BATCH(stencil_irb->region->pitch * stencil_irb->region->cpp - 1); + OUT_RELOC(stencil_irb->region->buffer, + I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, + 0); + ADVANCE_BATCH(); + } + + /* + * On Gen >= 6, emit clear params for safety. If using hiz, then clear + * params must be emitted. + * + * From Section 2.11.5.6.4.1 3DSTATE_CLEAR_PARAMS: + * 3DSTATE_CLEAR_PARAMS packet must follow the DEPTH_BUFFER_STATE packet + * when HiZ is enabled and the DEPTH_BUFFER_STATE changes. + */ + if (intel->gen >= 6 || hiz_region) { BEGIN_BATCH(2); OUT_BATCH(_3DSTATE_CLEAR_PARAMS << 16 | (2 - 2)); OUT_BATCH(0); diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 6c1eba69d4b..f560bc3fa66 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -134,6 +134,7 @@ brw_render_target_supported(gl_format format) */ if (format == MESA_FORMAT_S8_Z24 || format == MESA_FORMAT_X8_Z24 || + format == MESA_FORMAT_S8 || format == MESA_FORMAT_Z16) { return true; } @@ -168,6 +169,7 @@ translate_tex_format(gl_format mesa_format, return BRW_SURFACEFORMAT_L16_UNORM; case MESA_FORMAT_S8_Z24: + case MESA_FORMAT_X8_Z24: /* XXX: these different surface formats don't seem to * make any difference for shadow sampler/compares. */