Skip to content

Commit 7c61d83

Browse files
teoxoyteoxoy
committed
adjust GLSL snapshots
1 parent 7286fde commit 7c61d83

File tree

4 files changed

+269
-329
lines changed

4 files changed

+269
-329
lines changed

‎naga/tests/in/glsl/images.frag‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
#version 460 core
22

3+
// WGSL doesn't have 1D array textures.
4+
#define HAS_1D_ARRAY_TEXTURES 0
5+
36
layout(rgba8, binding = 0) uniform image1D img1D;
47
layout(rgba8, binding = 1) uniform image2D img2D;
58
layout(rgba8, binding = 2) uniform image3D img3D;
69
// layout(rgba8, binding = 3) uniform imageCube imgCube;
10+
#if HAS_1D_ARRAY_TEXTURES
711
layout(rgba8, binding = 4) uniform image1DArray img1DArray;
12+
#endif
813
layout(rgba8, binding = 5) uniform image2DArray img2DArray;
914
// layout(rgba8, binding = 6) uniform imageCubeArray imgCubeArray;
1015

@@ -18,11 +23,13 @@ void testImg1D(in int coord) {
1823
vec4 c = imageLoad(img1D, coord);
1924
}
2025

26+
#if HAS_1D_ARRAY_TEXTURES
2127
void testImg1DArray(in ivec2 coord) {
2228
vec2 size = imageSize(img1DArray);
2329
vec4 c = imageLoad(img1DArray, coord);
2430
imageStore(img1DArray, coord, vec4(2));
2531
}
32+
#endif
2633

2734
void testImg2D(in ivec2 coord) {
2835
vec2 size = imageSize(img2D);
@@ -72,7 +79,9 @@ void testImgWriteReadOnly(in ivec2 coord) {
7279

7380
void main() {
7481
testImg1D(1);
82+
#if HAS_1D_ARRAY_TEXTURES
7583
testImg1DArray(ivec2(0));
84+
#endif
7685
testImg2D(ivec2(0));
7786
testImg2DArray(ivec3(0));
7887
testImg3D(ivec3(0));

‎naga/tests/in/glsl/samplers.frag‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
#version 440 core
22
precision mediump float;
33

4+
// WGSL doesn't have 1D depth, 1D array or 2D multisampled array textures.
5+
#define HAS_1D_DEPTH_TEXTURES 0
6+
#define HAS_1D_ARRAY_TEXTURES 0
7+
#define HAS_2D_MS_ARRAY_TEXTURES 0
8+
49
layout(set = 1, binding = 0) uniform texture1D tex1D;
10+
#if HAS_1D_ARRAY_TEXTURES
511
layout(set = 1, binding = 1) uniform texture1DArray tex1DArray;
12+
#endif
613
layout(set = 1, binding = 2) uniform texture2D tex2D;
714
layout(set = 1, binding = 3) uniform texture2DArray tex2DArray;
815
layout(set = 1, binding = 4) uniform textureCube texCube;
@@ -14,9 +21,6 @@ layout(set = 1, binding = 8) uniform itexture2D itex2D;
1421

1522
layout(set = 2, binding = 0) uniform sampler samp;
1623

17-
// WGSL doesn't have 1D depth samplers.
18-
#define HAS_1D_DEPTH_TEXTURES 0
19-
2024
#if HAS_1D_DEPTH_TEXTURES
2125
layout(set = 1, binding = 10) uniform texture1D tex1DShadow;
2226
layout(set = 1, binding = 11) uniform texture1DArray tex1DArrayShadow;
@@ -30,7 +34,9 @@ layout(set = 1, binding = 16) uniform texture3D tex3DShadow;
3034
layout(set = 1, binding = 17) uniform samplerShadow sampShadow;
3135

3236
layout(binding = 18) uniform texture2DMS tex2DMS;
37+
#if HAS_2D_MS_ARRAY_TEXTURES
3338
layout(binding = 19) uniform texture2DMSArray tex2DMSArray;
39+
#endif
3440

3541
// Conventions for readability:
3642
// 1.0 = Shadow Ref
@@ -97,6 +103,7 @@ void testTex1DShadow(float coord) {
97103
}
98104
#endif
99105

106+
#if HAS_1D_ARRAY_TEXTURES
100107
void testTex1DArray(in vec2 coord) {
101108
ivec2 size1DArray = textureSize(sampler1DArray(tex1DArray, samp), 0);
102109
int levels = textureQueryLevels(sampler1DArray(tex1DArray, samp));
@@ -112,6 +119,7 @@ void testTex1DArray(in vec2 coord) {
112119
c = texelFetch(sampler1DArray(tex1DArray, samp), ivec2(coord), 3);
113120
c = texelFetchOffset(sampler1DArray(tex1DArray, samp), ivec2(coord), 3, 5);
114121
}
122+
#endif
115123

116124
#if HAS_1D_DEPTH_TEXTURES
117125
void testTex1DArrayShadow(in vec2 coord) {
@@ -290,18 +298,22 @@ void testTex2DMS(in vec2 coord) {
290298
c = texelFetch(sampler2DMS(tex2DMS, samp), ivec2(coord), 3);
291299
}
292300

301+
#if HAS_2D_MS_ARRAY_TEXTURES
293302
void testTex2DMSArray(in vec3 coord) {
294303
ivec3 size2DMSArray = textureSize(sampler2DMSArray(tex2DMSArray, samp));
295304
vec4 c;
296305
c = texelFetch(sampler2DMSArray(tex2DMSArray, samp), ivec3(coord), 3);
297306
}
307+
#endif
298308

299309
void main() {
300310
testTex1D(1.0);
301311
#if HAS_1D_DEPTH_TEXTURES
302312
testTex1DShadow(2.0);
303313
#endif
314+
#if HAS_1D_ARRAY_TEXTURES
304315
testTex1DArray(vec2(3.0));
316+
#endif
305317
#if HAS_1D_DEPTH_TEXTURES
306318
testTex1DArrayShadow(vec2(4.0));
307319
#endif
@@ -315,5 +327,7 @@ void main() {
315327
testTexCubeArrayShadow(vec4(1.0));
316328
testTex3D(vec3(1.0));
317329
testTex2DMS(vec2(1.0));
330+
#if HAS_2D_MS_ARRAY_TEXTURES
318331
testTex2DMSArray(vec3(1.0));
332+
#endif
319333
}

‎naga/tests/out/wgsl/glsl-images.frag.wgsl‎

Lines changed: 39 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ var img1D: texture_storage_1d<rgba8unorm,read_write>;
44
var img2D: texture_storage_2d<rgba8unorm,read_write>;
55
@group(0) @binding(2)
66
var img3D: texture_storage_3d<rgba8unorm,read_write>;
7-
@group(0) @binding(4)
8-
var img1DArray: texture_storage_1d_array<rgba8unorm,read_write>;
97
@group(0) @binding(5)
108
var img2DArray: texture_storage_2d_array<rgba8unorm,read_write>;
119
@group(0) @binding(7)
@@ -31,111 +29,93 @@ fn testImg1D(coord: i32) {
3129
return;
3230
}
3331

34-
fn testImg1DArray(coord_2: vec2<i32>) {
32+
fn testImg2D(coord_2: vec2<i32>) {
3533
var coord_3: vec2<i32>;
3634
var size_1: vec2<f32>;
3735
var c_1: vec4<f32>;
3836

3937
coord_3 = coord_2;
40-
let _e3 = textureDimensions(img1DArray);
41-
let _e4 = textureNumLayers(img1DArray);
42-
size_1 = vec2<f32>(vec2<i32>(vec2<u32>(_e3, _e4)));
43-
let _e9 = coord_3;
44-
let _e12 = textureLoad(img1DArray, _e9.x, _e9.y);
45-
c_1 = _e12;
46-
let _e14 = coord_3;
47-
textureStore(img1DArray, _e14.x, _e14.y, vec4(2f));
38+
let _e3 = textureDimensions(img2D);
39+
size_1 = vec2<f32>(vec2<i32>(_e3));
40+
let _e7 = coord_3;
41+
let _e8 = textureLoad(img2D, _e7);
42+
c_1 = _e8;
43+
let _e10 = coord_3;
44+
textureStore(img2D, _e10, vec4(2f));
4845
return;
4946
}
5047

51-
fn testImg2D(coord_4: vec2<i32>) {
52-
var coord_5: vec2<i32>;
53-
var size_2: vec2<f32>;
48+
fn testImg2DArray(coord_4: vec3<i32>) {
49+
var coord_5: vec3<i32>;
50+
var size_2: vec3<f32>;
5451
var c_2: vec4<f32>;
5552

5653
coord_5 = coord_4;
57-
let _e3 = textureDimensions(img2D);
58-
size_2 = vec2<f32>(vec2<i32>(_e3));
59-
let _e7 = coord_5;
60-
let _e8 = textureLoad(img2D, _e7);
61-
c_2 = _e8;
62-
let _e10 = coord_5;
63-
textureStore(img2D, _e10, vec4(2f));
54+
let _e3 = textureDimensions(img2DArray);
55+
let _e6 = textureNumLayers(img2DArray);
56+
size_2 = vec3<f32>(vec3<i32>(vec3<u32>(_e3.x, _e3.y, _e6)));
57+
let _e11 = coord_5;
58+
let _e14 = textureLoad(img2DArray, _e11.xy, _e11.z);
59+
c_2 = _e14;
60+
let _e16 = coord_5;
61+
textureStore(img2DArray, _e16.xy, _e16.z, vec4(2f));
6462
return;
6563
}
6664

67-
fn testImg2DArray(coord_6: vec3<i32>) {
65+
fn testImg3D(coord_6: vec3<i32>) {
6866
var coord_7: vec3<i32>;
6967
var size_3: vec3<f32>;
7068
var c_3: vec4<f32>;
7169

7270
coord_7 = coord_6;
73-
let _e3 = textureDimensions(img2DArray);
74-
let _e6 = textureNumLayers(img2DArray);
75-
size_3 = vec3<f32>(vec3<i32>(vec3<u32>(_e3.x, _e3.y, _e6)));
76-
let _e11 = coord_7;
77-
let _e14 = textureLoad(img2DArray, _e11.xy, _e11.z);
78-
c_3 = _e14;
79-
let _e16 = coord_7;
80-
textureStore(img2DArray, _e16.xy, _e16.z, vec4(2f));
71+
let _e3 = textureDimensions(img3D);
72+
size_3 = vec3<f32>(vec3<i32>(_e3));
73+
let _e7 = coord_7;
74+
let _e8 = textureLoad(img3D, _e7);
75+
c_3 = _e8;
76+
let _e10 = coord_7;
77+
textureStore(img3D, _e10, vec4(2f));
8178
return;
8279
}
8380

84-
fn testImg3D(coord_8: vec3<i32>) {
85-
var coord_9: vec3<i32>;
86-
var size_4: vec3<f32>;
81+
fn testImgReadOnly(coord_8: vec2<i32>) {
82+
var coord_9: vec2<i32>;
83+
var size_4: vec2<f32>;
8784
var c_4: vec4<f32>;
8885

8986
coord_9 = coord_8;
90-
let _e3 = textureDimensions(img3D);
91-
size_4 = vec3<f32>(vec3<i32>(_e3));
92-
let _e7 = coord_9;
93-
let _e8 = textureLoad(img3D, _e7);
94-
c_4 = _e8;
95-
let _e10 = coord_9;
96-
textureStore(img3D, _e10, vec4(2f));
87+
let _e4 = textureDimensions(img2D);
88+
size_4 = vec2<f32>(vec2<i32>(_e4));
89+
let _e8 = coord_9;
90+
let _e9 = textureLoad(imgReadOnly, _e8);
91+
c_4 = _e9;
9792
return;
9893
}
9994

100-
fn testImgReadOnly(coord_10: vec2<i32>) {
95+
fn testImgWriteOnly(coord_10: vec2<i32>) {
10196
var coord_11: vec2<i32>;
10297
var size_5: vec2<f32>;
103-
var c_5: vec4<f32>;
10498

10599
coord_11 = coord_10;
106100
let _e4 = textureDimensions(img2D);
107101
size_5 = vec2<f32>(vec2<i32>(_e4));
108102
let _e8 = coord_11;
109-
let _e9 = textureLoad(imgReadOnly, _e8);
110-
c_5 = _e9;
103+
textureStore(imgWriteOnly, _e8, vec4(2f));
111104
return;
112105
}
113106

114-
fn testImgWriteOnly(coord_12: vec2<i32>) {
107+
fn testImgWriteReadOnly(coord_12: vec2<i32>) {
115108
var coord_13: vec2<i32>;
116109
var size_6: vec2<f32>;
117110

118111
coord_13 = coord_12;
119-
let _e4 = textureDimensions(img2D);
120-
size_6 = vec2<f32>(vec2<i32>(_e4));
121-
let _e8 = coord_13;
122-
textureStore(imgWriteOnly, _e8, vec4(2f));
123-
return;
124-
}
125-
126-
fn testImgWriteReadOnly(coord_14: vec2<i32>) {
127-
var coord_15: vec2<i32>;
128-
var size_7: vec2<f32>;
129-
130-
coord_15 = coord_14;
131112
let _e3 = textureDimensions(imgWriteReadOnly);
132-
size_7 = vec2<f32>(vec2<i32>(_e3));
113+
size_6 = vec2<f32>(vec2<i32>(_e3));
133114
return;
134115
}
135116

136117
fn main_1() {
137118
testImg1D(1i);
138-
testImg1DArray(vec2(0i));
139119
testImg2D(vec2(0i));
140120
testImg2DArray(vec3(0i));
141121
testImg3D(vec3(0i));

0 commit comments

Comments
 (0)