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

MSL: Error out on int64_t/uint64_t buffer members.

Browse Source 
Not supported for whatever reason.
This commit is contained in:
Hans-Kristian Arntzen 2019-06-19 10:11:10 +02:00
parent a6b71ae999
commit a6798d06a2
4 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
reference/opt/shaders-msl/comp/int64.invalid.msl22.comp
View File

@ -3,51 +3,22 @@
using namespace metal;
struct M0
struct SSBO
{
long v;
long2 b[2];
ulong c;
ulong d[5];
int s32;
uint u32;
};
struct SSBO0
{
long4 a;
M0 m0;
};
constant long _162 = {};
struct SSBO1
kernel void main0(device SSBO& _96 [[buffer(0)]])
{
ulong4 b;
M0 m0;
};
struct SSBO2
{
long a[4];
long2 b[4];
};
struct SSBO3
{
long a[4];
long2 b[4];
};
kernel void main0(device SSBO0& ssbo_0 [[buffer(0)]], device SSBO1& ssbo_1 [[buffer(1)]], device SSBO2& ssbo_2 [[buffer(2)]], device SSBO3& ssbo_3 [[buffer(3)]])
{
ssbo_0.a += long4(10l, 20l, 30l, 40l);
ssbo_1.b += ulong4(999999999999999999ul, 8888888888888888ul, 77777777777777777ul, 6666666666666666ul);
ssbo_0.a += long4(20l);
ssbo_0.a = abs(ssbo_0.a + long4(ssbo_1.b));
ssbo_0.a += long4(1l);
ssbo_1.b += ulong4(long4(1l));
ssbo_0.a -= long4(1l);
ssbo_1.b -= ulong4(long4(1l));
ssbo_1.b = as_type<ulong4>(as_type<double4>(ssbo_0.a));
ssbo_0.a = as_type<long4>(as_type<double4>(ssbo_1.b));
ssbo_2.a[0] += 1l;
ssbo_3.a[0] += 2l;
long4 _137;
ulong4 _141;
_137 = abs((_137 + long4(30l, 40l, 50l, 60l)) + long4(_141 + ulong4(999999999999999999ul, 8888888888888888ul, 77777777777777777ul, 6666666666666666ul)));
_141 += ulong4(long4(999999999999999999l, 8888888888888888l, 77777777777777777l, 6666666666666666l));
ulong _109 = ulong(_162);
_96.s32 = int(uint(((ulong(_137.x) + _141.y) + _109) + _109));
_96.u32 = uint(((ulong(_137.y) + _141.z) + ulong(_162 + 1l)) + _109);
}

24
reference/shaders-msl/comp/int64.invalid.msl22.comp
View File

@ -11,33 +11,41 @@ struct M0
ulong d[5];
};
struct SSBO0
struct SSBO0_Type
{
long4 a;
M0 m0;
};
struct SSBO1
struct SSBO1_Type
{
ulong4 b;
M0 m0;
};
struct SSBO2
struct SSBO2_Type
{
long a[4];
long2 b[4];
};
struct SSBO3
struct SSBO3_Type
{
long a[4];
long2 b[4];
};
kernel void main0(device SSBO0& ssbo_0 [[buffer(0)]], device SSBO1& ssbo_1 [[buffer(1)]], device SSBO2& ssbo_2 [[buffer(2)]], device SSBO3& ssbo_3 [[buffer(3)]])
struct SSBO
{
int s32;
uint u32;
};
kernel void main0(device SSBO& _96 [[buffer(0)]])
{
SSBO0_Type ssbo_0;
ssbo_0.a += long4(10l, 20l, 30l, 40l);
SSBO1_Type ssbo_1;
ssbo_1.b += ulong4(999999999999999999ul, 8888888888888888ul, 77777777777777777ul, 6666666666666666ul);
ssbo_0.a += long4(20l);
ssbo_0.a = abs(ssbo_0.a + long4(ssbo_1.b));
@ -45,9 +53,11 @@ kernel void main0(device SSBO0& ssbo_0 [[buffer(0)]], device SSBO1& ssbo_1 [[buf
ssbo_1.b += ulong4(long4(1l));
ssbo_0.a -= long4(1l);
ssbo_1.b -= ulong4(long4(1l));
ssbo_1.b = as_type<ulong4>(as_type<double4>(ssbo_0.a));
ssbo_0.a = as_type<long4>(as_type<double4>(ssbo_1.b));
SSBO2_Type ssbo_2;
ssbo_2.a[0] += 1l;
SSBO3_Type ssbo_3;
ssbo_3.a[0] += 2l;
_96.s32 = int(uint(((ulong(ssbo_0.a.x) + ssbo_1.b.y) + ulong(ssbo_2.a[1])) + ulong(ssbo_3.a[2])));
_96.u32 = uint(((ulong(ssbo_0.a.y) + ssbo_1.b.z) + ulong(ssbo_2.a[0])) + ulong(ssbo_3.a[1]));
}

34
shaders-msl/comp/int64.invalid.msl22.comp
View File

@ -10,33 +10,43 @@ struct M0
uint64_t d[5];
};
// Test buffer layout handling.
layout(std430, binding = 0) buffer SSBO0
struct SSBO0_Type
{
i64vec4 a;
M0 m0;
} ssbo_0;
};
layout(std430, binding = 1) buffer SSBO1
struct SSBO1_Type
{
u64vec4 b;
M0 m0;
} ssbo_1;
};
layout(std430, binding = 2) buffer SSBO2
struct SSBO2_Type
{
int64_t a[4];
i64vec2 b[4];
} ssbo_2;
};
layout(std140, binding = 3) buffer SSBO3
struct SSBO3_Type
{
int64_t a[4];
i64vec2 b[4];
} ssbo_3;
};
layout(set = 0, binding = 0, std430) buffer SSBO
{
int s32;
uint u32;
};
void main()
{
SSBO0_Type ssbo_0;
SSBO1_Type ssbo_1;
SSBO2_Type ssbo_2;
SSBO3_Type ssbo_3;
ssbo_0.a += i64vec4(10, 20, 30, 40);
ssbo_1.b += u64vec4(999999999999999999ul, 8888888888888888ul, 77777777777777777ul, 6666666666666666ul);
ssbo_0.a += 20;
@ -47,9 +57,9 @@ void main()
ssbo_0.a--;
ssbo_1.b--;
ssbo_1.b = doubleBitsToUint64(int64BitsToDouble(ssbo_0.a));
ssbo_0.a = doubleBitsToInt64(uint64BitsToDouble(ssbo_1.b));
ssbo_2.a[0] += 1l;
ssbo_3.a[0] += 2l;
s32 = int(ssbo_0.a.x + ssbo_1.b.y + ssbo_2.a[1] + ssbo_3.a[2]);
u32 = uint(ssbo_0.a.y + ssbo_1.b.z + ssbo_2.a[0] + ssbo_3.a[1]);
}

7
spirv_msl.cpp
View File

@ -7906,6 +7906,13 @@ size_t CompilerMSL::get_declared_struct_member_alignment(const SPIRType &struct_
case SPIRType::Sampler:
SPIRV_CROSS_THROW("Querying alignment of opaque object.");
case SPIRType::Int64:
SPIRV_CROSS_THROW("long types are not supported in buffers in MSL.");
case SPIRType::UInt64:
SPIRV_CROSS_THROW("ulong types are not supported in buffers in MSL.");
case SPIRType::Double:
SPIRV_CROSS_THROW("double types are not supported in buffers in MSL.");
case SPIRType::Struct:
{
// In MSL, a struct's alignment is equal to the maximum alignment of any of its members.