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

Reduce test case ... MSL can't deal with certain unusual cases yet.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2018-05-02 10:01:08 +02:00
parent f3e810b8b3
commit 3187d89c31
3 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
reference/opt/shaders-msl/comp/composite-construct.comp
View File

@ -1,3 +1,5 @@
#pragma clang diagnostic ignored "-Wmissing-prototypes"
#include <metal_stdlib>
#include <simd/simd.h>
@ -8,8 +10,26 @@ struct SSBO0
float4 as[1];
};
kernel void main0(device SSBO0& _41 [[buffer(0)]], device SSBO0& _55 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]])
// Implementation of an array copy function to cover GLSL's ability to copy an array via assignment.
template<typename T, uint N>
void spvArrayCopy(thread T (&dst)[N], thread const T (&src)[N])
{
_41.as[gl_GlobalInvocationID.x] = ((_41.as[gl_GlobalInvocationID.x] + _55.as[gl_GlobalInvocationID.x]) + _55.as[gl_GlobalInvocationID.x]) + float4(10.0);
for (uint i = 0; i < N; dst[i] = src[i], i++);
}
// An overload for constant arrays.
template<typename T, uint N>
void spvArrayCopyConstant(thread T (&dst)[N], constant T (&src)[N])
{
for (uint i = 0; i < N; dst[i] = src[i], i++);
}
kernel void main0(device SSBO0& _16 [[buffer(0)]], device SSBO0& _32 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]], uint gl_LocalInvocationIndex [[thread_index_in_threadgroup]])
{
float4 _37[2] = { _16.as[gl_GlobalInvocationID.x], _32.as[gl_GlobalInvocationID.x] };
float4 values[2];
spvArrayCopy(values, _37);
_16.as[0] = values[gl_LocalInvocationIndex];
_32.as[1] = float4(40.0);
}

39
reference/shaders-msl/comp/composite-construct.comp
View File

@ -17,14 +17,11 @@ struct SSBO1
struct Composite
{
float4 a[2];
float4 b[2];
float4 a;
float4 b;
};
constant float4 _66[2] = {float4(10.0), float4(30.0)};
constant float _91[3] = {1.0, 1.0, 1.0};
constant float _93[3] = {2.0, 2.0, 2.0};
constant float _94[2][3] = {{1.0, 1.0, 1.0}, {2.0, 2.0, 2.0}};
constant float4 _43[2] = {float4(20.0), float4(40.0)};
// Implementation of an array copy function to cover GLSL's ability to copy an array via assignment.
template<typename T, uint N>
@ -40,30 +37,14 @@ void spvArrayCopyConstant(thread T (&dst)[N], constant T (&src)[N])
for (uint i = 0; i < N; dst[i] = src[i], i++);
}
float4 summe(thread const float4 (&values)[3][2])
kernel void main0(device SSBO0& _16 [[buffer(0)]], device SSBO1& _32 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]], uint gl_LocalInvocationIndex [[thread_index_in_threadgroup]])
{
return ((values[0][0] + values[2][1]) + values[0][1]) + values[1][0];
}
kernel void main0(device SSBO0& _41 [[buffer(0)]], device SSBO1& _55 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]])
{
float4 _60[2] = { _41.as[gl_GlobalInvocationID.x], _55.bs[gl_GlobalInvocationID.x] };
float4 _37[2] = { _16.as[gl_GlobalInvocationID.x], _32.bs[gl_GlobalInvocationID.x] };
float4 values[2];
spvArrayCopy(values, _60);
float4 const_values[2] = {float4(10.0), float4(30.0)};
float4 copy_values[2];
spvArrayCopy(copy_values, const_values);
float4 copy_values2[2];
spvArrayCopy(copy_values2, values);
float4 _76[3][2] = { values, copy_values, copy_values2 };
float4 param[3][2];
spvArrayCopy(param, _76);
_41.as[gl_GlobalInvocationID.x] = summe(param);
Composite c = Composite{ values, copy_values };
float arrayofarray[2][3] = {{1.0, 1.0, 1.0}, {2.0, 2.0, 2.0}};
float b = 10.0;
float _105[4] = { b, b, b, b };
float values_scalar[4];
spvArrayCopy(values_scalar, _105);
spvArrayCopy(values, _37);
float4 copy_values[2] = {float4(20.0), float4(40.0)};
Composite c = Composite{ values[0], copy_values[1] };
_16.as[0] = values[gl_LocalInvocationIndex];
_32.bs[1] = c.b;
}

23
shaders-msl/comp/composite-construct.comp
View File

@ -11,30 +11,21 @@ layout(std430, binding = 1) buffer SSBO1
vec4 bs[];
};
vec4 summe(vec4 values[3][2])
{
return values[0][0] + values[2][1] + values[0][1] + values[1][0];
}
struct Composite
{
vec4 a[2];
vec4 b[2];
vec4 a;
vec4 b;
};
const vec4 const_values[2] = vec4[](vec4(20.0), vec4(40.0));
void main()
{
vec4 values[2] = vec4[](as[gl_GlobalInvocationID.x], bs[gl_GlobalInvocationID.x]);
vec4 const_values[2] = vec4[](vec4(10.0), vec4(30.0));
vec4 copy_values[2];
copy_values = const_values;
vec4 copy_values2[2] = values;
as[gl_GlobalInvocationID.x] = summe(vec4[][](values, copy_values, copy_values2));
Composite c = Composite(values[0], copy_values[1]);
Composite c = Composite(values, copy_values);
float arrayofarray[2][3] = float[][](float[](1.0, 1.0, 1.0), float[](2.0, 2.0, 2.0));
float b = 10.0;
float values_scalar[4] = float[](b, b, b, b);
as[0] = values[gl_LocalInvocationIndex];
bs[1] = c.b;
}