nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-27 01:03:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glsl-in] Fix array index parsing for 1D images (#1445)

Browse Source
This commit is contained in:
João Capucho 2021-10-03 17:22:14 +01:00 committed by GitHub
parent f01eb72378
commit b34fa5f2cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/front/glsl/builtins.rs
View File

@ -1852,7 +1852,7 @@ impl Parser {
_ => coord,
};
let mut coord_index = image_size.map_or(0, |s| s as u32);
let mut coord_index = image_size.map_or(1, |s| s as u32);
let array_index = match arrayed {
true => {

16
tests/out/wgsl/samplers-frag.wgsl
View File

@ -146,28 +146,28 @@ fn testTex1DArray(coord2: vec2<f32>) {
coord3 = coord2;
let e18: vec2<f32> = coord3;
let e22: vec4<f32> = textureSample(tex1DArray, samp, e18.x, i32(e18.x));
let e22: vec4<f32> = textureSample(tex1DArray, samp, e18.x, i32(e18.y));
c1 = e22;
let e25: vec2<f32> = coord3;
let e30: vec4<f32> = textureSampleBias(tex1DArray, samp, e25.x, i32(e25.x), 2.0);
let e30: vec4<f32> = textureSampleBias(tex1DArray, samp, e25.x, i32(e25.y), 2.0);
c1 = e30;
let e34: vec2<f32> = coord3;
let e40: vec4<f32> = textureSampleGrad(tex1DArray, samp, e34.x, i32(e34.x), 4.0, 4.0);
let e40: vec4<f32> = textureSampleGrad(tex1DArray, samp, e34.x, i32(e34.y), 4.0, 4.0);
c1 = e40;
let e45: vec2<f32> = coord3;
let e52: vec4<f32> = textureSampleGrad(tex1DArray, samp, e45.x, i32(e45.x), 4.0, 4.0, 5);
let e52: vec4<f32> = textureSampleGrad(tex1DArray, samp, e45.x, i32(e45.y), 4.0, 4.0, 5);
c1 = e52;
let e55: vec2<f32> = coord3;
let e60: vec4<f32> = textureSampleLevel(tex1DArray, samp, e55.x, i32(e55.x), 3.0);
let e60: vec4<f32> = textureSampleLevel(tex1DArray, samp, e55.x, i32(e55.y), 3.0);
c1 = e60;
let e64: vec2<f32> = coord3;
let e70: vec4<f32> = textureSampleLevel(tex1DArray, samp, e64.x, i32(e64.x), 3.0, 5);
let e70: vec4<f32> = textureSampleLevel(tex1DArray, samp, e64.x, i32(e64.y), 3.0, 5);
c1 = e70;
let e73: vec2<f32> = coord3;
let e78: vec4<f32> = textureSample(tex1DArray, samp, e73.x, i32(e73.x), 5);
let e78: vec4<f32> = textureSample(tex1DArray, samp, e73.x, i32(e73.y), 5);
c1 = e78;
let e82: vec2<f32> = coord3;
let e88: vec4<f32> = textureSampleBias(tex1DArray, samp, e82.x, i32(e82.x), 2.0, 5);
let e88: vec4<f32> = textureSampleBias(tex1DArray, samp, e82.x, i32(e82.y), 2.0, 5);
c1 = e88;
return;
}