AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: respect fragment-shader depth-layout

Browse Source 
This is required by GLSL 1.30 and later, so we should also respect the
setting.

Fixes: 6785d8c460 ("zink: expose GLSL 1.30")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8644>
This commit is contained in:
Erik Faye-Lund
2021-01-22 11:42:18 +01:00
committed by Marge Bot
parent 855370bb62
commit 45bebc7a9c
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+19 -1
View File
@@ -3127,6 +3127,24 @@ get_output_prim_type_mode(uint16_t type)
return 0;
}
static SpvExecutionMode
get_depth_layout_mode(enum gl_frag_depth_layout depth_layout)
{
switch (depth_layout) {
case FRAG_DEPTH_LAYOUT_NONE:
case FRAG_DEPTH_LAYOUT_ANY:
return SpvExecutionModeDepthReplacing;
case FRAG_DEPTH_LAYOUT_GREATER:
return SpvExecutionModeDepthGreater;
case FRAG_DEPTH_LAYOUT_LESS:
return SpvExecutionModeDepthLess;
case FRAG_DEPTH_LAYOUT_UNCHANGED:
return SpvExecutionModeDepthUnchanged;
default:
unreachable("unexpected depth layout");
}
}
struct spirv_shader *
nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info,
unsigned char *shader_slot_map, unsigned char *shader_slots_reserved)
@@ -3275,7 +3293,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info,
SpvExecutionModeOriginUpperLeft);
if (s->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_DEPTH))
spirv_builder_emit_exec_mode(&ctx.builder, entry_point,
SpvExecutionModeDepthReplacing);
get_depth_layout_mode(s->info.fs.depth_layout));
if (s->info.fs.early_fragment_tests)
spirv_builder_emit_exec_mode(&ctx.builder, entry_point, SpvExecutionModeEarlyFragmentTests);
break;