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

zink: more accurately handle shader layer/viewport caps 

the spirv extension is required for spirv < 1.5, but the core cap should
be used for spirv >= 1.5

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11244>
This commit is contained in:
Mike Blumenkrantz 2021-06-08 11:23:43 -04:00 committed by Marge Bot
parent 3b81f53e34
commit 7b13c1461d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3611,9 +3611,12 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, uint32_t
if (s->info.stage < MESA_SHADER_GEOMETRY) {
if (s->info.outputs_written & BITFIELD64_BIT(VARYING_SLOT_LAYER) ||
s->info.inputs_read & BITFIELD64_BIT(VARYING_SLOT_LAYER)) {
spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_shader_viewport_index_layer");
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderViewportIndexLayerEXT);
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderLayer);
if (spirv_version >= SPIRV_VERSION(1, 5))
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderLayer);
else {
spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_shader_viewport_index_layer");
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderViewportIndexLayerEXT);
}
}
}