mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-15 16:16:08 +00:00
GLSL: Change Add[Spirv]BlockAttribute to support GLSL
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
committed by
Dawn LUCI CQ
Dawn LUCI CQ
parent
822de46c74
commit
863d9edf59
@@ -1,10 +1,10 @@
|
||||
SKIP: FAILED
|
||||
|
||||
binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
expressions/binary/mul/mat3x2-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
matrix : mat3x2<f16>,
|
||||
^^^^^^^^^^^
|
||||
|
||||
binary/mul/mat3x2-vec3/f16.wgsl:2:1 note: see layout of struct:
|
||||
expressions/binary/mul/mat3x2-vec3/f16.wgsl:2:1 note: see layout of struct:
|
||||
/* align(8) size(24) */ struct S {
|
||||
/* offset( 0) align(4) size(12) */ matrix : mat3x2<f16>;
|
||||
/* offset(12) align(1) size( 4) */ // -- implicit field alignment padding --;
|
||||
@@ -14,7 +14,7 @@ binary/mul/mat3x2-vec3/f16.wgsl:2:1 note: see layout of struct:
|
||||
struct S {
|
||||
^^^^^^
|
||||
|
||||
binary/mul/mat3x2-vec3/f16.wgsl:6:36 note: see declaration of variable
|
||||
expressions/binary/mul/mat3x2-vec3/f16.wgsl:6:36 note: see declaration of variable
|
||||
@group(0) @binding(0) var<uniform> data: S;
|
||||
^^^^
|
||||
|
||||
|
||||
@@ -6,14 +6,7 @@ struct S {
|
||||
vec3 vector;
|
||||
};
|
||||
|
||||
struct S_std140 {
|
||||
vec2 matrix_0;
|
||||
vec2 matrix_1;
|
||||
vec2 matrix_2;
|
||||
vec3 vector;
|
||||
};
|
||||
|
||||
layout(binding = 0) uniform S_std140_1 {
|
||||
layout(binding = 0) uniform S_std140_ubo {
|
||||
vec2 matrix_0;
|
||||
vec2 matrix_1;
|
||||
vec2 matrix_2;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
SKIP: FAILED
|
||||
|
||||
binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
expressions/binary/mul/mat3x3-vec3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
matrix : mat3x3<f16>,
|
||||
^^^^^^^^^^^
|
||||
|
||||
binary/mul/mat3x3-vec3/f16.wgsl:2:1 note: see layout of struct:
|
||||
expressions/binary/mul/mat3x3-vec3/f16.wgsl:2:1 note: see layout of struct:
|
||||
/* align(8) size(32) */ struct S {
|
||||
/* offset( 0) align(8) size(24) */ matrix : mat3x3<f16>;
|
||||
/* offset(24) align(8) size( 6) */ vector : vec3<f16>;
|
||||
@@ -13,7 +13,7 @@ binary/mul/mat3x3-vec3/f16.wgsl:2:1 note: see layout of struct:
|
||||
struct S {
|
||||
^^^^^^
|
||||
|
||||
binary/mul/mat3x3-vec3/f16.wgsl:6:36 note: see declaration of variable
|
||||
expressions/binary/mul/mat3x3-vec3/f16.wgsl:6:36 note: see declaration of variable
|
||||
@group(0) @binding(0) var<uniform> data: S;
|
||||
^^^^
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
#version 310 es
|
||||
precision mediump float;
|
||||
|
||||
struct S {
|
||||
mat3 matrix;
|
||||
vec3 vector;
|
||||
};
|
||||
|
||||
layout(binding = 0) uniform S_1 {
|
||||
layout(binding = 0) uniform S_ubo {
|
||||
mat3 matrix;
|
||||
vec3 vector;
|
||||
} data;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
SKIP: FAILED
|
||||
|
||||
binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
expressions/binary/mul/vec3-mat3x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
matrix : mat3x3<f16>,
|
||||
^^^^^^^^^^^
|
||||
|
||||
binary/mul/vec3-mat3x3/f16.wgsl:2:1 note: see layout of struct:
|
||||
expressions/binary/mul/vec3-mat3x3/f16.wgsl:2:1 note: see layout of struct:
|
||||
/* align(8) size(32) */ struct S {
|
||||
/* offset( 0) align(8) size(24) */ matrix : mat3x3<f16>;
|
||||
/* offset(24) align(8) size( 6) */ vector : vec3<f16>;
|
||||
@@ -13,7 +13,7 @@ binary/mul/vec3-mat3x3/f16.wgsl:2:1 note: see layout of struct:
|
||||
struct S {
|
||||
^^^^^^
|
||||
|
||||
binary/mul/vec3-mat3x3/f16.wgsl:6:36 note: see declaration of variable
|
||||
expressions/binary/mul/vec3-mat3x3/f16.wgsl:6:36 note: see declaration of variable
|
||||
@group(0) @binding(0) var<uniform> data: S;
|
||||
^^^^
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
#version 310 es
|
||||
precision mediump float;
|
||||
|
||||
struct S {
|
||||
mat3 matrix;
|
||||
vec3 vector;
|
||||
};
|
||||
|
||||
layout(binding = 0) uniform S_1 {
|
||||
layout(binding = 0) uniform S_ubo {
|
||||
mat3 matrix;
|
||||
vec3 vector;
|
||||
} data;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
SKIP: FAILED
|
||||
|
||||
binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
expressions/binary/mul/vec3-mat4x3/f16.wgsl:3:14 error: using f16 types in 'uniform' storage class is not implemented yet
|
||||
matrix : mat4x3<f16>,
|
||||
^^^^^^^^^^^
|
||||
|
||||
binary/mul/vec3-mat4x3/f16.wgsl:2:1 note: see layout of struct:
|
||||
expressions/binary/mul/vec3-mat4x3/f16.wgsl:2:1 note: see layout of struct:
|
||||
/* align(8) size(40) */ struct S {
|
||||
/* offset( 0) align(8) size(32) */ matrix : mat4x3<f16>;
|
||||
/* offset(32) align(8) size( 6) */ vector : vec3<f16>;
|
||||
@@ -13,7 +13,7 @@ binary/mul/vec3-mat4x3/f16.wgsl:2:1 note: see layout of struct:
|
||||
struct S {
|
||||
^^^^^^
|
||||
|
||||
binary/mul/vec3-mat4x3/f16.wgsl:6:36 note: see declaration of variable
|
||||
expressions/binary/mul/vec3-mat4x3/f16.wgsl:6:36 note: see declaration of variable
|
||||
@group(0) @binding(0) var<uniform> data: S;
|
||||
^^^^
|
||||
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
#version 310 es
|
||||
precision mediump float;
|
||||
|
||||
struct S {
|
||||
mat4x3 matrix;
|
||||
vec3 vector;
|
||||
};
|
||||
|
||||
layout(binding = 0) uniform S_1 {
|
||||
layout(binding = 0) uniform S_ubo {
|
||||
mat4x3 matrix;
|
||||
vec3 vector;
|
||||
} data;
|
||||
|
||||
Reference in New Issue
Block a user