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

spirv: Add SpvCapabilityShaderViewportIndexLayerEXT

Browse Source 
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 <itoral@igalia.com>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2018-03-05 13:58:11 -08:00
committed by Samuel Iglesias Gonsálvez
parent 487f8d48c9
commit c17808562e
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/compiler/shader_info.h
View File

@@ -43,6 +43,7 @@ struct spirv_supported_capabilities {
bool multiview; bool multiview;
bool variable_pointers; bool variable_pointers;
bool storage_16bit; bool storage_16bit;
bool shader_viewport_index_layer;
}; };
typedef struct shader_info { typedef struct shader_info {

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

@@ -3203,6 +3203,10 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
spv_check_supported(storage_16bit, cap); spv_check_supported(storage_16bit, cap);
break; break;
case SpvCapabilityShaderViewportIndexLayerEXT:
spv_check_supported(shader_viewport_index_layer, cap);
break;
default: default:
vtn_fail("Unhandled capability"); vtn_fail("Unhandled capability");
} }

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

@@ -1187,6 +1187,10 @@ vtn_get_builtin_location(struct vtn_builder *b,
*mode = nir_var_shader_in; *mode = nir_var_shader_in;
else if (b->shader->info.stage == MESA_SHADER_GEOMETRY) else if (b->shader->info.stage == MESA_SHADER_GEOMETRY)
*mode = nir_var_shader_out; *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 else
vtn_fail("invalid stage for SpvBuiltInLayer"); vtn_fail("invalid stage for SpvBuiltInLayer");
break; break;
@@ -1194,6 +1198,10 @@ vtn_get_builtin_location(struct vtn_builder *b,
*location = VARYING_SLOT_VIEWPORT; *location = VARYING_SLOT_VIEWPORT;
if (b->shader->info.stage == MESA_SHADER_GEOMETRY) if (b->shader->info.stage == MESA_SHADER_GEOMETRY)
*mode = nir_var_shader_out; *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) else if (b->shader->info.stage == MESA_SHADER_FRAGMENT)
*mode = nir_var_shader_in; *mode = nir_var_shader_in;
else else