Merge pull request #1361 from KhronosGroup/msl-single-element-array-refinement
MSL: Avoid packed arrays in more cases.
diff --git a/reference/opt/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert b/reference/opt/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
index 72c3027..1926ff9 100644
--- a/reference/opt/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
+++ b/reference/opt/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _9.umatrix * float4(_9.uquad[int(gl_VertexIndex)].x, _9.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (uint(_9.flags.flags[0]) != 0u)
+ if (_9.flags.flags[0] != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/opt/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert b/reference/opt/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
index eac3c9f..ee20638 100644
--- a/reference/opt/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
+++ b/reference/opt/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
@@ -5,7 +5,7 @@
struct Struct
{
- packed_uint2 flags[1];
+ uint2 flags[1];
};
struct defaultUniformsVS
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _9.umatrix * float4(_9.uquad[int(gl_VertexIndex)].x, _9.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (_9.flags.flags[0][0u] != 0u)
+ if (_9.flags.flags[0].x != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/opt/shaders-msl/comp/struct-packing.comp b/reference/opt/shaders-msl/comp/struct-packing.comp
index 48dc17b..dc16543 100644
--- a/reference/opt/shaders-msl/comp/struct-packing.comp
+++ b/reference/opt/shaders-msl/comp/struct-packing.comp
@@ -66,7 +66,7 @@
struct S0_1
{
- packed_float2 a[1];
+ float2 a[1];
char _m1_pad[8];
float b;
char _m0_final_padding[12];
@@ -124,13 +124,13 @@
kernel void main0(device SSBO1& ssbo_430 [[buffer(0)]], device SSBO0& ssbo_140 [[buffer(1)]])
{
Content_1 _60 = ssbo_140.content;
- ssbo_430.content.m0s[0].a[0] = float2(_60.m0s[0].a[0]);
+ ssbo_430.content.m0s[0].a[0] = _60.m0s[0].a[0];
ssbo_430.content.m0s[0].b = _60.m0s[0].b;
ssbo_430.content.m1s[0].a = float3(_60.m1s[0].a);
ssbo_430.content.m1s[0].b = _60.m1s[0].b;
ssbo_430.content.m2s[0].a[0] = _60.m2s[0].a[0];
ssbo_430.content.m2s[0].b = _60.m2s[0].b;
- ssbo_430.content.m0.a[0] = float2(_60.m0.a[0]);
+ ssbo_430.content.m0.a[0] = _60.m0.a[0];
ssbo_430.content.m0.b = _60.m0.b;
ssbo_430.content.m1.a = float3(_60.m1.a);
ssbo_430.content.m1.b = _60.m1.b;
diff --git a/reference/opt/shaders-msl/vert/packed-bool-to-uint.vert b/reference/opt/shaders-msl/vert/packed-bool-to-uint.vert
index 7c07fde..6cc5520 100644
--- a/reference/opt/shaders-msl/vert/packed-bool-to-uint.vert
+++ b/reference/opt/shaders-msl/vert/packed-bool-to-uint.vert
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _24.umatrix * float4(_24.uquad[int(gl_VertexIndex)].x, _24.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (uint(_24.flags.flags[0]) != 0u)
+ if (_24.flags.flags[0] != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/opt/shaders-msl/vert/packed-bool2-to-packed_uint2.vert b/reference/opt/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
index da8acca..4c46aae 100644
--- a/reference/opt/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
+++ b/reference/opt/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
@@ -5,7 +5,7 @@
struct Struct
{
- packed_uint2 flags[1];
+ uint2 flags[1];
};
struct defaultUniformsVS
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _25.umatrix * float4(_25.uquad[int(gl_VertexIndex)].x, _25.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (_25.flags.flags[0][0u] != 0u)
+ if (_25.flags.flags[0].x != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp b/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp
index fb1721f..49758ca 100644
--- a/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp
+++ b/reference/shaders-msl-no-opt/comp/struct-packing-scalar.nocompat.invalid.vk.comp
@@ -61,7 +61,7 @@
struct S0_1
{
- packed_float2 a[1];
+ float2 a[1];
char _m1_pad[8];
float b;
char _m0_final_padding[12];
@@ -126,13 +126,13 @@
kernel void main0(device SSBO1& ssbo_scalar [[buffer(0)]], device SSBO0& ssbo_140 [[buffer(1)]], device SSBO2& ssbo_scalar2 [[buffer(2)]])
{
- ssbo_scalar.content.m0s[0].a[0] = float2(ssbo_140.content.m0s[0].a[0]);
+ ssbo_scalar.content.m0s[0].a[0] = ssbo_140.content.m0s[0].a[0];
ssbo_scalar.content.m0s[0].b = ssbo_140.content.m0s[0].b;
ssbo_scalar.content.m1s[0].a = float3(ssbo_140.content.m1s[0].a);
ssbo_scalar.content.m1s[0].b = ssbo_140.content.m1s[0].b;
ssbo_scalar.content.m2s[0].a[0] = ssbo_140.content.m2s[0].a[0];
ssbo_scalar.content.m2s[0].b = ssbo_140.content.m2s[0].b;
- ssbo_scalar.content.m0.a[0] = float2(ssbo_140.content.m0.a[0]);
+ ssbo_scalar.content.m0.a[0] = ssbo_140.content.m0.a[0];
ssbo_scalar.content.m0.b = ssbo_140.content.m0.b;
ssbo_scalar.content.m1.a = float3(ssbo_140.content.m1.a);
ssbo_scalar.content.m1.b = ssbo_140.content.m1.b;
diff --git a/reference/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert b/reference/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
index 72c3027..1926ff9 100644
--- a/reference/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
+++ b/reference/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _9.umatrix * float4(_9.uquad[int(gl_VertexIndex)].x, _9.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (uint(_9.flags.flags[0]) != 0u)
+ if (_9.flags.flags[0] != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert b/reference/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
index eac3c9f..ee20638 100644
--- a/reference/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
+++ b/reference/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert
@@ -5,7 +5,7 @@
struct Struct
{
- packed_uint2 flags[1];
+ uint2 flags[1];
};
struct defaultUniformsVS
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _9.umatrix * float4(_9.uquad[int(gl_VertexIndex)].x, _9.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (_9.flags.flags[0][0u] != 0u)
+ if (_9.flags.flags[0].x != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/shaders-msl/comp/struct-packing.comp b/reference/shaders-msl/comp/struct-packing.comp
index 48dc17b..dc16543 100644
--- a/reference/shaders-msl/comp/struct-packing.comp
+++ b/reference/shaders-msl/comp/struct-packing.comp
@@ -66,7 +66,7 @@
struct S0_1
{
- packed_float2 a[1];
+ float2 a[1];
char _m1_pad[8];
float b;
char _m0_final_padding[12];
@@ -124,13 +124,13 @@
kernel void main0(device SSBO1& ssbo_430 [[buffer(0)]], device SSBO0& ssbo_140 [[buffer(1)]])
{
Content_1 _60 = ssbo_140.content;
- ssbo_430.content.m0s[0].a[0] = float2(_60.m0s[0].a[0]);
+ ssbo_430.content.m0s[0].a[0] = _60.m0s[0].a[0];
ssbo_430.content.m0s[0].b = _60.m0s[0].b;
ssbo_430.content.m1s[0].a = float3(_60.m1s[0].a);
ssbo_430.content.m1s[0].b = _60.m1s[0].b;
ssbo_430.content.m2s[0].a[0] = _60.m2s[0].a[0];
ssbo_430.content.m2s[0].b = _60.m2s[0].b;
- ssbo_430.content.m0.a[0] = float2(_60.m0.a[0]);
+ ssbo_430.content.m0.a[0] = _60.m0.a[0];
ssbo_430.content.m0.b = _60.m0.b;
ssbo_430.content.m1.a = float3(_60.m1.a);
ssbo_430.content.m1.b = _60.m1.b;
diff --git a/reference/shaders-msl/vert/packed-bool-to-uint.vert b/reference/shaders-msl/vert/packed-bool-to-uint.vert
index 7c07fde..6cc5520 100644
--- a/reference/shaders-msl/vert/packed-bool-to-uint.vert
+++ b/reference/shaders-msl/vert/packed-bool-to-uint.vert
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _24.umatrix * float4(_24.uquad[int(gl_VertexIndex)].x, _24.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (uint(_24.flags.flags[0]) != 0u)
+ if (_24.flags.flags[0] != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/reference/shaders-msl/vert/packed-bool2-to-packed_uint2.vert b/reference/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
index da8acca..4c46aae 100644
--- a/reference/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
+++ b/reference/shaders-msl/vert/packed-bool2-to-packed_uint2.vert
@@ -5,7 +5,7 @@
struct Struct
{
- packed_uint2 flags[1];
+ uint2 flags[1];
};
struct defaultUniformsVS
@@ -29,7 +29,7 @@
{
main0_out out = {};
out.gl_Position = _25.umatrix * float4(_25.uquad[int(gl_VertexIndex)].x, _25.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
- if (_25.flags.flags[0][0u] != 0u)
+ if (_25.flags.flags[0].x != 0u)
{
out.gl_Position.z = 0.0;
}
diff --git a/spirv_msl.cpp b/spirv_msl.cpp
index 76ebd9f..55968d0 100644
--- a/spirv_msl.cpp
+++ b/spirv_msl.cpp
@@ -3087,11 +3087,11 @@
{
// If we have an array type, array stride must match exactly with SPIR-V.
- // An exception to this requirement is if we have one array element and a packed decoration.
+ // An exception to this requirement is if we have one array element.
// This comes from DX scalar layout workaround.
// If app tries to be cheeky and access the member out of bounds, this will not work, but this is the best we can do.
- bool relax_array_stride = has_extended_member_decoration(type.self, index, SPIRVCrossDecorationPhysicalTypePacked) &&
- mbr_type.array.back() == 1 && mbr_type.array_size_literal.back();
+ // In OpAccessChain with logical memory models, access chains must be in-bounds in SPIR-V specification.
+ bool relax_array_stride = mbr_type.array.back() == 1 && mbr_type.array_size_literal.back();
if (!relax_array_stride)
{
@@ -3137,7 +3137,9 @@
SPIRV_CROSS_THROW("Cannot perform any repacking for structs when it is used as a member of another struct.");
// Perform remapping here.
- set_extended_member_decoration(ib_type.self, index, SPIRVCrossDecorationPhysicalTypePacked);
+ // There is nothing to be gained by using packed scalars, so don't attempt it.
+ if (!is_scalar(ib_type))
+ set_extended_member_decoration(ib_type.self, index, SPIRVCrossDecorationPhysicalTypePacked);
// Try validating again, now with packed.
if (validate_member_packing_rules_msl(ib_type, index))
