diff options
| author | Caio Marcelo de Oliveira Filho <[email protected]> | 2018-03-05 13:58:11 -0800 |
|---|---|---|
| committer | Samuel Iglesias Gonsálvez <[email protected]> | 2018-03-07 07:04:20 +0100 |
| commit | c17808562e4ff3bcc3c3755a6b5ffbf86b8624ad (patch) | |
| tree | 98f6c6c7af004c57db942081ab83adc2b2e83820 | |
| parent | 487f8d48c9bb876a93867ef86aca696bbac97916 (diff) | |
spirv: Add SpvCapabilityShaderViewportIndexLayerEXT
This capability allows gl_ViewportIndex and gl_Layer to also be used
as outputs in Vertex and Tesselation shaders.
v2: Make conditional to the capability, add gl_Layer, add tesselation
shaders. (Iago)
v3: Don't export to tesselation control shader.
v4: Add Reviewd-by tag.
Reviewed-by: Iago Toral Quiroga <[email protected]>
| -rw-r--r-- | src/compiler/shader_info.h | 1 | ||||
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 4 | ||||
| -rw-r--r-- | src/compiler/spirv/vtn_variables.c | 8 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index e7fd7dbe62d..2fcbde74bee 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -43,6 +43,7 @@ struct spirv_supported_capabilities { bool multiview; bool variable_pointers; bool storage_16bit; + bool shader_viewport_index_layer; }; typedef struct shader_info { diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index c6df764682e..fdb2993db51 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -3203,6 +3203,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, spv_check_supported(storage_16bit, cap); break; + case SpvCapabilityShaderViewportIndexLayerEXT: + spv_check_supported(shader_viewport_index_layer, cap); + break; + default: vtn_fail("Unhandled capability"); } diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 7e8a090adde..11d2aabac8c 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1187,6 +1187,10 @@ vtn_get_builtin_location(struct vtn_builder *b, *mode = nir_var_shader_in; else if (b->shader->info.stage == MESA_SHADER_GEOMETRY) *mode = nir_var_shader_out; + else if (b->options && b->options->caps.shader_viewport_index_layer && + (b->shader->info.stage == MESA_SHADER_VERTEX || + b->shader->info.stage == MESA_SHADER_TESS_EVAL)) + *mode = nir_var_shader_out; else vtn_fail("invalid stage for SpvBuiltInLayer"); break; @@ -1194,6 +1198,10 @@ vtn_get_builtin_location(struct vtn_builder *b, *location = VARYING_SLOT_VIEWPORT; if (b->shader->info.stage == MESA_SHADER_GEOMETRY) *mode = nir_var_shader_out; + else if (b->options && b->options->caps.shader_viewport_index_layer && + (b->shader->info.stage == MESA_SHADER_VERTEX || + b->shader->info.stage == MESA_SHADER_TESS_EVAL)) + *mode = nir_var_shader_out; else if (b->shader->info.stage == MESA_SHADER_FRAGMENT) *mode = nir_var_shader_in; else |