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

spirv: handle ViewportMaskNV builtin/cap from SPV_NV_mesh_shader

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14263>
This commit is contained in:
Marcin Ślusarz
2021-12-17 17:00:08 +01:00
committed by Marge Bot
parent 1619279219
commit 4cb7dcb097
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/shader_info.h
View File

@@ -85,6 +85,7 @@ struct spirv_supported_capabilities {
bool float_controls; bool float_controls;
bool shader_clock; bool shader_clock;
bool shader_viewport_index_layer; bool shader_viewport_index_layer;
bool shader_viewport_mask_nv;
bool sparse_residency; bool sparse_residency;
bool stencil_export; bool stencil_export;
bool storage_8bit; bool storage_8bit;

4
src/compiler/spirv/spirv_to_nir.c
View File

@@ -4805,6 +4805,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
spv_check_supported(mesh_shading_nv, cap); spv_check_supported(mesh_shading_nv, cap);
break; break;
case SpvCapabilityShaderViewportMaskNV:
spv_check_supported(shader_viewport_mask_nv, cap);
break;
default: default:
vtn_fail("Unhandled capability: %s (%u)", vtn_fail("Unhandled capability: %s (%u)",
spirv_capability_to_string(cap), cap); spirv_capability_to_string(cap), cap);

4
src/compiler/spirv/vtn_variables.c
View File

@@ -864,6 +864,10 @@ vtn_get_builtin_location(struct vtn_builder *b,
else else
vtn_fail("invalid stage for SpvBuiltInViewportIndex"); vtn_fail("invalid stage for SpvBuiltInViewportIndex");
break; break;
case SpvBuiltInViewportMaskNV:
*location = VARYING_SLOT_VIEWPORT_MASK;
*mode = nir_var_shader_out;
break;
case SpvBuiltInTessLevelOuter: case SpvBuiltInTessLevelOuter:
*location = VARYING_SLOT_TESS_LEVEL_OUTER; *location = VARYING_SLOT_TESS_LEVEL_OUTER;
break; break;