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

GLSL: Change Add[Spirv]BlockAttribute to support GLSL

Browse Source 
Modify the AddSpirvBlockAttribute transform to fix top-level structure
access of uniform, storage and push-constant buffers for use in the
GLSL backend. The small change to the transform makes the transform
wrap host-sharable buffers, if they're also used as a
non-host-sharable structure. Also rename the transform to
AddBlockAttrbibute in order to reflect its wider applicability.

Change-Id: Ib2bf4ebf6bce72790791dbae9387032be765e4b9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/101061
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Stephen White
2022-09-02 19:19:10 +00:00
committed by Dawn LUCI CQ
parent 822de46c74
commit 863d9edf59
362 changed files with 2316 additions and 3876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/tint/buffer/uniform/std140/mat2x2/dynamic_index_via_ptr.wgsl.expected.glsl
View File

@@ -17,11 +17,7 @@ struct Outer_std140 {
Inner_std140 a[4];
};
struct a_block {
Outer_std140 inner[4];
};
layout(binding = 0) uniform a_block_1 {
layout(binding = 0) uniform a_block_ubo {
Outer_std140 inner[4];
} a;

6
test/tint/buffer/uniform/std140/mat2x2/static_index_via_ptr.wgsl.expected.glsl
View File

@@ -17,11 +17,7 @@ struct Outer_std140 {
Inner_std140 a[4];
};
struct a_block {
Outer_std140 inner[4];
};
layout(binding = 0) uniform a_block_1 {
layout(binding = 0) uniform a_block_ubo {
Outer_std140 inner[4];
} a;

6
test/tint/buffer/uniform/std140/mat2x2/to_builtin.wgsl.expected.glsl
View File

@@ -13,11 +13,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat2x2/to_fn.wgsl.expected.glsl
View File

@@ -13,11 +13,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat2x2/to_private.wgsl.expected.glsl
View File

@@ -13,11 +13,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

13
test/tint/buffer/uniform/std140/mat2x2/to_storage.wgsl.expected.glsl
View File

@@ -13,21 +13,14 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;
struct s_block {
S inner[4];
};
layout(binding = 1, std430) buffer s_block_1 {
layout(binding = 1, std430) buffer s_block_ssbo {
S inner[4];
} s;
S conv_S(S_std140 val) {
S tint_symbol = S(val.before, mat2(val.m_0, val.m_1), val.after);
return tint_symbol;

6
test/tint/buffer/uniform/std140/mat2x2/to_workgroup.wgsl.expected.glsl
View File

@@ -13,11 +13,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat3x2/dynamic_index_via_ptr.wgsl.expected.glsl
View File

@@ -18,11 +18,7 @@ struct Outer_std140 {
Inner_std140 a[4];
};
struct a_block {
Outer_std140 inner[4];
};
layout(binding = 0) uniform a_block_1 {
layout(binding = 0) uniform a_block_ubo {
Outer_std140 inner[4];
} a;

6
test/tint/buffer/uniform/std140/mat3x2/static_index_via_ptr.wgsl.expected.glsl
View File

@@ -18,11 +18,7 @@ struct Outer_std140 {
Inner_std140 a[4];
};
struct a_block {
Outer_std140 inner[4];
};
layout(binding = 0) uniform a_block_1 {
layout(binding = 0) uniform a_block_ubo {
Outer_std140 inner[4];
} a;

6
test/tint/buffer/uniform/std140/mat3x2/to_builtin.wgsl.expected.glsl
View File

@@ -14,11 +14,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat3x2/to_fn.wgsl.expected.glsl
View File

@@ -14,11 +14,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat3x2/to_private.wgsl.expected.glsl
View File

@@ -14,11 +14,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

13
test/tint/buffer/uniform/std140/mat3x2/to_storage.wgsl.expected.glsl
View File

@@ -14,21 +14,14 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;
struct s_block {
S inner[4];
};
layout(binding = 1, std430) buffer s_block_1 {
layout(binding = 1, std430) buffer s_block_ssbo {
S inner[4];
} s;
S conv_S(S_std140 val) {
S tint_symbol = S(val.before, mat3x2(val.m_0, val.m_1, val.m_2), val.after);
return tint_symbol;

6
test/tint/buffer/uniform/std140/mat3x2/to_workgroup.wgsl.expected.glsl
View File

@@ -14,11 +14,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat4x2/dynamic_index_via_ptr.wgsl.expected.glsl
View File

@@ -19,11 +19,7 @@ struct Outer_std140 {
Inner_std140 a[4];
};
struct a_block {
Outer_std140 inner[4];
};
layout(binding = 0) uniform a_block_1 {
layout(binding = 0) uniform a_block_ubo {
Outer_std140 inner[4];
} a;

6
test/tint/buffer/uniform/std140/mat4x2/static_index_via_ptr.wgsl.expected.glsl
View File

@@ -19,11 +19,7 @@ struct Outer_std140 {
Inner_std140 a[4];
};
struct a_block {
Outer_std140 inner[4];
};
layout(binding = 0) uniform a_block_1 {
layout(binding = 0) uniform a_block_ubo {
Outer_std140 inner[4];
} a;

6
test/tint/buffer/uniform/std140/mat4x2/to_builtin.wgsl.expected.glsl
View File

@@ -15,11 +15,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat4x2/to_fn.wgsl.expected.glsl
View File

@@ -15,11 +15,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

6
test/tint/buffer/uniform/std140/mat4x2/to_private.wgsl.expected.glsl
View File

@@ -15,11 +15,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;

13
test/tint/buffer/uniform/std140/mat4x2/to_storage.wgsl.expected.glsl
View File

@@ -15,21 +15,14 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;
struct s_block {
S inner[4];
};
layout(binding = 1, std430) buffer s_block_1 {
layout(binding = 1, std430) buffer s_block_ssbo {
S inner[4];
} s;
S conv_S(S_std140 val) {
S tint_symbol = S(val.before, mat4x2(val.m_0, val.m_1, val.m_2, val.m_3), val.after);
return tint_symbol;

6
test/tint/buffer/uniform/std140/mat4x2/to_workgroup.wgsl.expected.glsl
View File

@@ -15,11 +15,7 @@ struct S_std140 {
int after;
};
struct u_block {
S_std140 inner[4];
};
layout(binding = 0) uniform u_block_1 {
layout(binding = 0) uniform u_block_ubo {
S_std140 inner[4];
} u;