github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[glsl-in] Always use uint for array size (#1448)

Browse Source
This commit is contained in:
João Capucho
2021-10-05 18:05:47 +01:00
committed by GitHub
parent 71a75d727d
commit da00bf2be6
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/front/glsl/parser/types.rs
View File

@@ -24,7 +24,18 @@ impl<'source> ParsingContext<'source> {
return Ok(Some((ArraySize::Dynamic, meta)));
}
let (constant, _) = self.parse_constant_expression(parser)?;
let (value, span) = self.parse_uint_constant(parser)?;
let constant = parser.module.constants.fetch_or_append(
crate::Constant {
name: None,
specialization: None,
inner: crate::ConstantInner::Scalar {
width: 4,
value: crate::ScalarValue::Uint(value as u64),
},
},
span,
);
let end_meta = self.expect(parser, TokenValue::RightBracket)?.meta;
meta.subsume(end_meta);
Ok(Some((ArraySize::Constant(constant), meta)))

4
tests/out/wgsl/bevy-pbr-frag.wgsl
View File

@@ -23,8 +23,8 @@ struct CameraPosition {
struct Lights {
AmbientColor: vec4<f32>;
NumLights: vec4<u32>;
PointLights: [[stride(48)]] array<PointLight,10>;
DirectionalLights: [[stride(32)]] array<DirectionalLight,1>;
PointLights: [[stride(48)]] array<PointLight,10u>;
DirectionalLights: [[stride(32)]] array<DirectionalLight,1u>;
};
[[block]]

2
tests/out/wgsl/constant-array-size-vert.wgsl
View File

@@ -1,6 +1,6 @@
[[block]]
struct Data {
vecs: [[stride(16)]] array<vec4<f32>,42>;
vecs: [[stride(16)]] array<vec4<f32>,42u>;
};
[[group(1), binding(0)]]

2
tests/out/wgsl/expressions-frag.wgsl
View File

@@ -181,7 +181,7 @@ fn testStructConstructor() {
}
fn testArrayConstructor() {
var tree1: array<f32,1> = array<f32,1>(0.0);
var tree1: array<f32,1u> = array<f32,1u>(0.0);
}

2
tests/out/wgsl/global-constant-array-vert.wgsl
View File

@@ -1,7 +1,7 @@
var<private> i: u32;
fn main1() {
var local: array<f32,2> = array<f32,2>(1.0, 2.0);
var local: array<f32,2u> = array<f32,2u>(1.0, 2.0);
let e2: u32 = i;
}