OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/blorp: Emit more complete DEPTH_STENCIL state

Browse Source 
This should now set the pipeline up properly for doing depth and/or stencil
clears by plumbing through depth/stencil test values.  We are now also
emitting color calculator state for blorp operations without an actual
shader because that is where the stencil reference value goes pre-SKL.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand
2016-10-06 23:08:08 -07:00
parent 7017742ad7
commit bc4bb5a7e3
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/intel/blorp/blorp_genX_exec.h
View File

@@ -891,11 +891,17 @@ static uint32_t
blorp_emit_color_calc_state(struct blorp_batch *batch, blorp_emit_color_calc_state(struct blorp_batch *batch,
const struct blorp_params *params) const struct blorp_params *params)
{ {
struct GENX(COLOR_CALC_STATE) cc = { 0 };
#if GEN_GEN <= 8
cc.StencilReferenceValue = params->stencil_ref;
#endif
uint32_t offset; uint32_t offset;
void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_CC_STATE, void *state = blorp_alloc_dynamic_state(batch, AUB_TRACE_CC_STATE,
GENX(COLOR_CALC_STATE_length) * 4, GENX(COLOR_CALC_STATE_length) * 4,
64, &offset); 64, &offset);
memset(state, 0, GENX(COLOR_CALC_STATE_length) * 4); GENX(COLOR_CALC_STATE_pack)(NULL, state, &cc);
#if GEN_GEN >= 7 #if GEN_GEN >= 7
blorp_emit(batch, GENX(3DSTATE_CC_STATE_POINTERS), sp) { blorp_emit(batch, GENX(3DSTATE_CC_STATE_POINTERS), sp) {
@@ -921,16 +927,44 @@ blorp_emit_depth_stencil_state(struct blorp_batch *batch,
struct GENX(DEPTH_STENCIL_STATE) ds = { 0 }; struct GENX(DEPTH_STENCIL_STATE) ds = { 0 };
#endif #endif
ds.DepthBufferWriteEnable = params->depth.addr.buffer != NULL; if (params->depth.addr.buffer) {
ds.DepthBufferWriteEnable = true;
/* See the following sections of the Sandy Bridge PRM, Volume 1, Part2: switch (params->hiz_op) {
case BLORP_HIZ_OP_NONE:
ds.DepthTestEnable = true;
ds.DepthTestFunction = COMPAREFUNCTION_ALWAYS;
break;
/* See the following sections of the Sandy Bridge PRM, Volume 2, Part1:
* - 7.5.3.1 Depth Buffer Clear * - 7.5.3.1 Depth Buffer Clear
* - 7.5.3.2 Depth Buffer Resolve * - 7.5.3.2 Depth Buffer Resolve
* - 7.5.3.3 Hierarchical Depth Buffer Resolve * - 7.5.3.3 Hierarchical Depth Buffer Resolve
*/ */
if (params->hiz_op == BLORP_HIZ_OP_DEPTH_RESOLVE) { case BLORP_HIZ_OP_DEPTH_RESOLVE:
ds.DepthTestEnable = true; ds.DepthTestEnable = true;
ds.DepthTestFunction = COMPAREFUNCTION_NEVER; ds.DepthTestFunction = COMPAREFUNCTION_NEVER;
break;
case BLORP_HIZ_OP_DEPTH_CLEAR:
case BLORP_HIZ_OP_HIZ_RESOLVE:
ds.DepthTestEnable = false;
break;
}
}
if (params->stencil.addr.buffer) {
ds.StencilBufferWriteEnable = true;
ds.StencilTestEnable = true;
ds.DoubleSidedStencilEnable = false;
ds.StencilTestFunction = COMPAREFUNCTION_ALWAYS;
ds.StencilPassDepthPassOp = STENCILOP_REPLACE;
ds.StencilWriteMask = params->stencil_mask;
#if GEN_GEN >= 9
ds.StencilReferenceValue = params->stencil_ref;
#endif
} }
#if GEN_GEN >= 8 #if GEN_GEN >= 8
@@ -1186,8 +1220,8 @@ blorp_exec(struct blorp_batch *batch, const struct blorp_params *params)
if (params->wm_prog_data) { if (params->wm_prog_data) {
blend_state_offset = blorp_emit_blend_state(batch, params); blend_state_offset = blorp_emit_blend_state(batch, params);
color_calc_state_offset = blorp_emit_color_calc_state(batch, params);
} }
color_calc_state_offset = blorp_emit_color_calc_state(batch, params);
depth_stencil_state_offset = blorp_emit_depth_stencil_state(batch, params); depth_stencil_state_offset = blorp_emit_depth_stencil_state(batch, params);
#if GEN_GEN <= 6 #if GEN_GEN <= 6

2
src/intel/blorp/blorp_priv.h
View File

@@ -181,6 +181,8 @@ struct blorp_params
uint32_t x1; uint32_t x1;
uint32_t y1; uint32_t y1;
float z; float z;
uint8_t stencil_mask;
uint8_t stencil_ref;
struct brw_blorp_surface_info depth; struct brw_blorp_surface_info depth;
struct brw_blorp_surface_info stencil; struct brw_blorp_surface_info stencil;
uint32_t depth_format; uint32_t depth_format;