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

zink: check shader stencil output

Browse Source 
Enable SPV_EXT_stencil_export and SpvCapabilityStencilExportEXT and
mark output with FragStencilRefEXT when fragment shader writes to
reference stencil value.

Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9244>
This commit is contained in:
Antonio Caggiano
2020-07-17 16:11:17 +02:00
committed by Mike Blumenkrantz
parent ef48d57b77
commit 8724d4fb36
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View File

@@ -577,6 +577,10 @@ emit_output(struct ntv_context *ctx, struct nir_variable *var)
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInSampleMask);
break;
case FRAG_RESULT_STENCIL:
spirv_builder_emit_builtin(&ctx->builder, var_id, SpvBuiltInFragStencilRefEXT);
break;
default:
spirv_builder_emit_location(&ctx->builder, var_id, slot);
spirv_builder_emit_index(&ctx->builder, var_id, var->data.index);
@@ -3650,6 +3654,11 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info,
spirv_builder_emit_mem_model(&ctx.builder, SpvAddressingModelLogical,
SpvMemoryModelGLSL450);
if (s->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_STENCIL)) {
spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_shader_stencil_export");
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityStencilExportEXT);
}
SpvExecutionModel exec_model;
switch (s->info.stage) {
case MESA_SHADER_VERTEX:
@@ -3715,6 +3724,9 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info,
if (s->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_DEPTH))
spirv_builder_emit_exec_mode(&ctx.builder, entry_point,
get_depth_layout_mode(s->info.fs.depth_layout));
if (s->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_STENCIL))
spirv_builder_emit_exec_mode(&ctx.builder, entry_point,
SpvExecutionModeStencilRefReplacingEXT);
if (s->info.fs.early_fragment_tests)
spirv_builder_emit_exec_mode(&ctx.builder, entry_point,
SpvExecutionModeEarlyFragmentTests);