Skip to content

Commit 76e9122

Browse files
authored
Merge branch 'trunk' into transient
2 parents 3d063d7 + 3efd640 commit 76e9122

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ By @cwfitzgerald in [#8162](https://github.com/gfx-rs/wgpu/pull/8162).
198198
- If the shader source contains control characters, naga now replaces them with U+FFFD ("replacement character") in diagnostic output. By @andyleiserson in [#8049](https://github.com/gfx-rs/wgpu/pull/8049).
199199
- Add f16 IO polyfill on Vulkan backend to enable SHADER_F16 use without requiring `storageInputOutput16`. By @cryvosh in [#7884](https://github.com/gfx-rs/wgpu/pull/7884).
200200
- For custom Naga backend authors: `naga::proc::Namer` now accepts reserved keywords using two new dedicated types, `proc::{KeywordSet, CaseInsensitiveKeywordSet}`. By @kpreid in [#8136](https://github.com/gfx-rs/wgpu/pull/8136).
201+
- **BREAKING**: Previously the WGSL storage-texture format `rg11b10float` was incorrectly accepted and generated by naga, but now only accepts the the correct name `rg11b10ufloat` instead. By @ErikWDev in [#8219](https://github.com/gfx-rs/wgpu/pull/8219).
201202

202203
#### DX12
203204

naga/src/common/wgsl/to_wgsl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl ToWgsl for crate::StorageFormat {
244244
Sf::Bgra8Unorm => "bgra8unorm",
245245
Sf::Rgb10a2Uint => "rgb10a2uint",
246246
Sf::Rgb10a2Unorm => "rgb10a2unorm",
247-
Sf::Rg11b10Ufloat => "rg11b10float",
247+
Sf::Rg11b10Ufloat => "rg11b10ufloat",
248248
Sf::R64Uint => "r64uint",
249249
Sf::Rg32Uint => "rg32uint",
250250
Sf::Rg32Sint => "rg32sint",

naga/src/front/wgsl/parse/conv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub fn map_storage_format(word: &str, span: Span) -> Result<'_, crate::StorageFo
115115
"rgba8sint" => Sf::Rgba8Sint,
116116
"rgb10a2uint" => Sf::Rgb10a2Uint,
117117
"rgb10a2unorm" => Sf::Rgb10a2Unorm,
118-
"rg11b10float" => Sf::Rg11b10Ufloat,
118+
"rg11b10ufloat" => Sf::Rg11b10Ufloat,
119119
"r64uint" => Sf::R64Uint,
120120
"rg32uint" => Sf::Rg32Uint,
121121
"rg32sint" => Sf::Rg32Sint,

naga/src/front/wgsl/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ fn parse_texture_load_store_expecting_four_args() {
627627
for (func, texture) in [
628628
(
629629
"textureStore",
630-
"texture_storage_2d_array<rg11b10float, write>",
630+
"texture_storage_2d_array<rg11b10ufloat, write>",
631631
),
632632
("textureLoad", "texture_2d_array<i32>"),
633633
] {

0 commit comments

Comments
 (0)