AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSL: Add trivial tests for Component decoration.

Browse Source 
Verifies that Component decoration is honored for vertex outputs and
fragment inputs.
This commit is contained in:
Hans-Kristian Arntzen 2020-01-07 11:36:51 +01:00
parent 961b9014af
commit 7a69d764b0
5 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
reference/shaders-msl-no-opt/components/fragment-input-component.frag Normal file
View File

@ -0,0 +1,23 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float4 FragColor [[color(0)]];
};
struct main0_in
{
float3 Foo3 [[user(locn0)]];
float Foo1 [[user(locn0_3)]];
};
fragment main0_out main0(main0_in in [[stage_in]])
{
main0_out out = {};
out.FragColor = float4(in.Foo3, in.Foo1);
return out;
}

26
reference/shaders-msl-no-opt/components/vertex-output-component.vert Normal file
View File

@ -0,0 +1,26 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct main0_out
{
float3 Foo3 [[user(locn0)]];
float Foo1 [[user(locn0_3)]];
float4 gl_Position [[position]];
};
struct main0_in
{
float4 vFoo [[attribute(0)]];
};
vertex main0_out main0(main0_in in [[stage_in]])
{
main0_out out = {};
out.gl_Position = in.vFoo;
out.Foo3 = in.vFoo.xyz;
out.Foo1 = in.vFoo.w;
return out;
}

10
shaders-msl-no-opt/components/fragment-input-component.frag Normal file
View File

@ -0,0 +1,10 @@
#version 450
layout(location = 0, component = 3) in float Foo1;
layout(location = 0, component = 0) in vec3 Foo3;
layout(location = 0) out vec4 FragColor;
void main()
{
FragColor = vec4(Foo3, Foo1);
}

12
shaders-msl-no-opt/components/vertex-output-component.vert Normal file
View File

@ -0,0 +1,12 @@
#version 450
layout(location = 0) in vec4 vFoo;
layout(location = 0) out vec3 Foo3;
layout(location = 0, component = 3) out float Foo1;
void main()
{
gl_Position = vFoo;
Foo3 = vFoo.xyz;
Foo1 = vFoo.w;
}

9
spirv_msl.cpp
View File

@ -8604,7 +8604,14 @@ string CompilerMSL::member_attribute_qualifier(const SPIRType &type, uint32_t in
uint32_t locn = get_ordered_member_location(type.self, index, &comp);
if (locn != k_unknown_location)
{
if (comp != k_unknown_component)
// For user-defined attributes, this is fine. From Vulkan spec:
// A user-defined output variable is considered to match an input variable in the subsequent stage if
// the two variables are declared with the same Location and Component decoration and match in type
// and decoration, except that interpolation decorations are not required to match. For the purposes
// of interface matching, variables declared without a Component decoration are considered to have a
// Component decoration of zero.
if (comp != k_unknown_component && comp != 0)
quals = string("user(locn") + convert_to_string(locn) + "_" + convert_to_string(comp) + ")";
else
quals = string("user(locn") + convert_to_string(locn) + ")";