encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-10 14:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint/writer/msl: Generate an array<T,N> helper

Browse Source 
And remove the WrapArraysInStructs transform.

Wrapping arrays in structures becomes troublesome for `const` arrays, as
currently WGSL does not allow `const` structures.

MSL 2.0+ has a builtin array<> helper, but we're targetting MSL 1.2, so
we have to emit our own. Fortunately, it can be done with a few lines of
templated code.

This produces significantly cleaner output.

Change-Id: Ifc92ef21e09befa252a07c856c4b5afdc51cc2e4
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/94540
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
Ben Clayton
2022-06-24 17:01:59 +00:00
committed by Dawn LUCI CQ
parent 3c054304a8
commit f47887d207
218 changed files with 3637 additions and 2269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/tint/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.msl
View File

@@ -2,6 +2,18 @@
using namespace metal;
template<typename T, size_t N>
struct tint_array {
const constant T& operator[](size_t i) const constant { return elements[i]; }
device T& operator[](size_t i) device { return elements[i]; }
const device T& operator[](size_t i) const device { return elements[i]; }
thread T& operator[](size_t i) thread { return elements[i]; }
const thread T& operator[](size_t i) const thread { return elements[i]; }
threadgroup T& operator[](size_t i) threadgroup { return elements[i]; }
const threadgroup T& operator[](size_t i) const threadgroup { return elements[i]; }
T elements[N];
};
template<typename T, int N, int M>
inline vec<T, M> operator*(matrix<T, N, M> lhs, packed_vec<T, N> rhs) {
return lhs * vec<T, N>(rhs);
@@ -14,9 +26,9 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
struct S {
/* 0x0000 */ float3x2 tint_symbol;
/* 0x0018 */ int8_t tint_pad[8];
/* 0x0018 */ tint_array<int8_t, 8> tint_pad;
/* 0x0020 */ packed_float3 vector;
/* 0x002c */ int8_t tint_pad_1[4];
/* 0x002c */ tint_array<int8_t, 4> tint_pad_1;
};
fragment void tint_symbol_1(const constant S* tint_symbol_2 [[buffer(0)]]) {

14
test/tint/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.msl
View File

@@ -12,10 +12,22 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
return vec<T, M>(lhs) * rhs;
}
template<typename T, size_t N>
struct tint_array {
const constant T& operator[](size_t i) const constant { return elements[i]; }
device T& operator[](size_t i) device { return elements[i]; }
const device T& operator[](size_t i) const device { return elements[i]; }
thread T& operator[](size_t i) thread { return elements[i]; }
const thread T& operator[](size_t i) const thread { return elements[i]; }
threadgroup T& operator[](size_t i) threadgroup { return elements[i]; }
const threadgroup T& operator[](size_t i) const threadgroup { return elements[i]; }
T elements[N];
};
struct S {
/* 0x0000 */ float3x3 tint_symbol;
/* 0x0030 */ packed_float3 vector;
/* 0x003c */ int8_t tint_pad[4];
/* 0x003c */ tint_array<int8_t, 4> tint_pad;
};
fragment void tint_symbol_1(const constant S* tint_symbol_2 [[buffer(0)]]) {

14
test/tint/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.msl
View File

@@ -12,10 +12,22 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
return vec<T, M>(lhs) * rhs;
}
template<typename T, size_t N>
struct tint_array {
const constant T& operator[](size_t i) const constant { return elements[i]; }
device T& operator[](size_t i) device { return elements[i]; }
const device T& operator[](size_t i) const device { return elements[i]; }
thread T& operator[](size_t i) thread { return elements[i]; }
const thread T& operator[](size_t i) const thread { return elements[i]; }
threadgroup T& operator[](size_t i) threadgroup { return elements[i]; }
const threadgroup T& operator[](size_t i) const threadgroup { return elements[i]; }
T elements[N];
};
struct S {
/* 0x0000 */ float3x3 tint_symbol;
/* 0x0030 */ packed_float3 vector;
/* 0x003c */ int8_t tint_pad[4];
/* 0x003c */ tint_array<int8_t, 4> tint_pad;
};
fragment void tint_symbol_1(const constant S* tint_symbol_2 [[buffer(0)]]) {

14
test/tint/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.msl
View File

@@ -12,10 +12,22 @@ inline vec<T, N> operator*(packed_vec<T, M> lhs, matrix<T, N, M> rhs) {
return vec<T, M>(lhs) * rhs;
}
template<typename T, size_t N>
struct tint_array {
const constant T& operator[](size_t i) const constant { return elements[i]; }
device T& operator[](size_t i) device { return elements[i]; }
const device T& operator[](size_t i) const device { return elements[i]; }
thread T& operator[](size_t i) thread { return elements[i]; }
const thread T& operator[](size_t i) const thread { return elements[i]; }
threadgroup T& operator[](size_t i) threadgroup { return elements[i]; }
const threadgroup T& operator[](size_t i) const threadgroup { return elements[i]; }
T elements[N];
};
struct S {
/* 0x0000 */ float4x3 tint_symbol;
/* 0x0040 */ packed_float3 vector;
/* 0x004c */ int8_t tint_pad[4];
/* 0x004c */ tint_array<int8_t, 4> tint_pad;
};
fragment void tint_symbol_1(const constant S* tint_symbol_2 [[buffer(0)]]) {