fc4a12fd4f
The standard `matrix` type in MSL lacked a constructor in the `threadgroup` AS. This means that it was impossible to declare a `threadgroup` variable that contains a matrix. This appears to have been an oversight that was corrected in macOS 13/Xcode 14 beta 4. This workaround continues to be required, however, for older systems. To avoid changing interfaces unnecessarily (which shouldn't be a problem regardless because the old and new types take up the same amount of storage), only do this for structs if the struct is positively identified as being used for workgroup storage. I'm entirely aware this is inconsistent with the way packed matrices are handled. One of them should be changed to match the other. Not sure which one. Fixes 23 CTS tests under `dEQP-VK.memory_model.shared`.
34 lines
1.2 KiB
Plaintext
34 lines
1.2 KiB
Plaintext
#version 450
|
|
layout(local_size_x = 1) in;
|
|
|
|
layout(std140, binding = 0) buffer block { highp uint passed; };
|
|
struct S1 {
|
|
mediump vec4 a;
|
|
highp mat3x2 b;
|
|
bvec4 c;
|
|
};
|
|
|
|
bool compare_float (highp float a, highp float b) { return abs(a - b) < 0.05; }
|
|
bool compare_vec2 (highp vec2 a, highp vec2 b) { return compare_float(a.x, b.x)&&compare_float(a.y, b.y); }
|
|
bool compare_vec4 (highp vec4 a, highp vec4 b) { return compare_float(a.x, b.x)&&compare_float(a.y, b.y)&&compare_float(a.z, b.z)&&compare_float(a.w, b.w); }
|
|
bool compare_mat3x2 (highp mat3x2 a, highp mat3x2 b){ return compare_vec2(a[0], b[0])&&compare_vec2(a[1], b[1])&&compare_vec2(a[2], b[2]); }
|
|
bool compare_bvec4 (bvec4 a, bvec4 b) { return a == b; }
|
|
|
|
shared S1 s1;
|
|
|
|
void main (void) {
|
|
s1.a = vec4(1.0, -5.0, -9.0, -5.0);
|
|
s1.b = mat3x2(1.0, -7.0, 1.0, 2.0, 8.0, 7.0);
|
|
s1.c = bvec4(false, true, false, false);
|
|
|
|
barrier();
|
|
memoryBarrier();
|
|
bool allOk = true;
|
|
allOk = allOk && compare_vec4(vec4(1.0, -5.0, -9.0, -5.0), s1.a);
|
|
allOk = allOk && compare_mat3x2(mat3x2(1.0, -7.0, 1.0, 2.0, 8.0, 7.0), s1.b);
|
|
allOk = allOk && compare_bvec4(bvec4(false, true, false, false), s1.c);
|
|
if (allOk)
|
|
passed++;
|
|
|
|
}
|