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

dzn: Handle split front/back compare/write masks for dynamic state

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20364>
This commit is contained in:
Jesse Natalie
2022-12-16 14:03:12 -08:00
parent 33e2444384
commit a573f6a6da
1 changed files with 107 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
src/microsoft/vulkan/dzn_pipeline.c
View File

@@ -1783,6 +1783,106 @@ out:
return ret; return ret;
} }
static void
mask_key_for_stencil_state(struct dzn_physical_device *pdev,
struct dzn_graphics_pipeline *pipeline,
const struct dzn_graphics_pipeline_variant_key *key,
struct dzn_graphics_pipeline_variant_key *masked_key)
{
if (pdev->options14.IndependentFrontAndBackStencilRefMaskSupported) {
const D3D12_DEPTH_STENCIL_DESC2 *ds_templ =
dzn_graphics_pipeline_get_desc_template(pipeline, ds);
if (ds_templ && ds_templ->StencilEnable) {
if (ds_templ->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds_templ->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
masked_key->stencil_test.front.compare_mask = key->stencil_test.front.compare_mask;
if (ds_templ->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds_templ->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
masked_key->stencil_test.back.compare_mask = key->stencil_test.back.compare_mask;
if (pipeline->zsa.stencil_test.dynamic_write_mask) {
masked_key->stencil_test.front.write_mask = key->stencil_test.front.write_mask;
masked_key->stencil_test.back.write_mask = key->stencil_test.back.write_mask;
}
}
} else {
const D3D12_DEPTH_STENCIL_DESC1 *ds_templ =
dzn_graphics_pipeline_get_desc_template(pipeline, ds);
if (ds_templ && ds_templ->StencilEnable) {
if (ds_templ->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds_templ->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
masked_key->stencil_test.front.compare_mask = key->stencil_test.front.compare_mask;
if (ds_templ->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds_templ->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
masked_key->stencil_test.back.compare_mask = key->stencil_test.back.compare_mask;
if (pipeline->zsa.stencil_test.dynamic_write_mask) {
masked_key->stencil_test.front.write_mask = key->stencil_test.front.write_mask;
masked_key->stencil_test.back.write_mask = key->stencil_test.back.write_mask;
}
}
}
}
static void
update_stencil_state(struct dzn_physical_device *pdev,
struct dzn_graphics_pipeline *pipeline,
uintptr_t *stream_buf,
const struct dzn_graphics_pipeline_variant_key *masked_key)
{
if (pdev->options14.IndependentFrontAndBackStencilRefMaskSupported) {
D3D12_DEPTH_STENCIL_DESC2 *ds =
dzn_graphics_pipeline_get_desc(pipeline, stream_buf, ds);
if (ds && ds->StencilEnable) {
if (pipeline->zsa.stencil_test.dynamic_compare_mask) {
if (ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS) {
ds->FrontFace.StencilReadMask = masked_key->stencil_test.front.compare_mask;
}
if (ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS) {
ds->BackFace.StencilReadMask = masked_key->stencil_test.back.compare_mask;
}
}
if (pipeline->zsa.stencil_test.dynamic_write_mask) {
ds->FrontFace.StencilWriteMask = masked_key->stencil_test.front.write_mask;
ds->BackFace.StencilWriteMask = masked_key->stencil_test.back.write_mask;
}
}
} else {
D3D12_DEPTH_STENCIL_DESC1 *ds =
dzn_graphics_pipeline_get_desc(pipeline, stream_buf, ds);
if (ds && ds->StencilEnable) {
if (pipeline->zsa.stencil_test.dynamic_compare_mask) {
if (ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS) {
ds->StencilReadMask = masked_key->stencil_test.front.compare_mask;
}
if (ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS) {
ds->StencilReadMask = masked_key->stencil_test.back.compare_mask;
}
if (ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
assert(masked_key->stencil_test.front.compare_mask == masked_key->stencil_test.back.compare_mask);
}
if (pipeline->zsa.stencil_test.dynamic_write_mask) {
assert(!masked_key->stencil_test.front.write_mask ||
!masked_key->stencil_test.back.write_mask ||
masked_key->stencil_test.front.write_mask == masked_key->stencil_test.back.write_mask);
ds->StencilWriteMask =
masked_key->stencil_test.front.write_mask |
masked_key->stencil_test.back.write_mask;
}
}
}
}
ID3D12PipelineState * ID3D12PipelineState *
dzn_graphics_pipeline_get_state(struct dzn_graphics_pipeline *pipeline, dzn_graphics_pipeline_get_state(struct dzn_graphics_pipeline *pipeline,
const struct dzn_graphics_pipeline_variant_key *key) const struct dzn_graphics_pipeline_variant_key *key)
@@ -1790,6 +1890,11 @@ dzn_graphics_pipeline_get_state(struct dzn_graphics_pipeline *pipeline,
if (!pipeline->variants) if (!pipeline->variants)
return pipeline->base.state; return pipeline->base.state;
struct dzn_device *device =
container_of(pipeline->base.base.device, struct dzn_device, vk);
struct dzn_physical_device *pdev =
container_of(device->vk.physical, struct dzn_physical_device, vk);
struct dzn_graphics_pipeline_variant_key masked_key = { 0 }; struct dzn_graphics_pipeline_variant_key masked_key = { 0 };
if (dzn_graphics_pipeline_get_desc_template(pipeline, ib_strip_cut)) if (dzn_graphics_pipeline_get_desc_template(pipeline, ib_strip_cut))
@@ -1799,23 +1904,8 @@ dzn_graphics_pipeline_get_state(struct dzn_graphics_pipeline *pipeline,
pipeline->zsa.dynamic_depth_bias) pipeline->zsa.dynamic_depth_bias)
masked_key.depth_bias = key->depth_bias; masked_key.depth_bias = key->depth_bias;
const D3D12_DEPTH_STENCIL_DESC1 *ds_templ = mask_key_for_stencil_state(pdev, pipeline, key, &masked_key);
dzn_graphics_pipeline_get_desc_template(pipeline, ds);
if (ds_templ && ds_templ->StencilEnable) {
if (ds_templ->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds_templ->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
masked_key.stencil_test.front.compare_mask = key->stencil_test.front.compare_mask;
if (ds_templ->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds_templ->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
masked_key.stencil_test.back.compare_mask = key->stencil_test.back.compare_mask;
if (pipeline->zsa.stencil_test.dynamic_write_mask) {
masked_key.stencil_test.front.write_mask = key->stencil_test.front.write_mask;
masked_key.stencil_test.back.write_mask = key->stencil_test.back.write_mask;
}
}
struct dzn_device *device =
container_of(pipeline->base.base.device, struct dzn_device, vk);
struct hash_entry *he = struct hash_entry *he =
_mesa_hash_table_search(pipeline->variants, &masked_key); _mesa_hash_table_search(pipeline->variants, &masked_key);
@@ -1846,36 +1936,7 @@ dzn_graphics_pipeline_get_state(struct dzn_graphics_pipeline *pipeline,
rast->SlopeScaledDepthBias = masked_key.depth_bias.slope_factor; rast->SlopeScaledDepthBias = masked_key.depth_bias.slope_factor;
} }
D3D12_DEPTH_STENCIL_DESC1 *ds = update_stencil_state(pdev, pipeline, stream_buf, &masked_key);
dzn_graphics_pipeline_get_desc(pipeline, stream_buf, ds);
if (ds && ds->StencilEnable) {
if (pipeline->zsa.stencil_test.dynamic_compare_mask) {
if (ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS) {
ds->StencilReadMask = masked_key.stencil_test.front.compare_mask;
}
if (ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS) {
ds->StencilReadMask = masked_key.stencil_test.back.compare_mask;
}
if (ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->FrontFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_NEVER &&
ds->BackFace.StencilFunc != D3D12_COMPARISON_FUNC_ALWAYS)
assert(masked_key.stencil_test.front.compare_mask == masked_key.stencil_test.back.compare_mask);
}
if (pipeline->zsa.stencil_test.dynamic_write_mask) {
assert(!masked_key.stencil_test.front.write_mask ||
!masked_key.stencil_test.back.write_mask ||
masked_key.stencil_test.front.write_mask == masked_key.stencil_test.back.write_mask);
ds->StencilWriteMask =
masked_key.stencil_test.front.write_mask |
masked_key.stencil_test.back.write_mask;
}
}
ASSERTED HRESULT hres = ID3D12Device4_CreatePipelineState(device->dev, &stream_desc, ASSERTED HRESULT hres = ID3D12Device4_CreatePipelineState(device->dev, &stream_desc,
&IID_ID3D12PipelineState, &IID_ID3D12PipelineState,