Skip to content

Commit b695317

Browse files
Rg11b10ufloat should be resolvable when it is renderable (#7878)
1 parent 361fe34 commit b695317

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

cts_runner/test.lst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ webgpu:api,validation,queue,submit:command_buffer,submit_invalidates:*
5050
//FAIL: webgpu:api,validation,queue,submit:command_buffer,invalid_submit_invalidates:*
5151
// https://github.com/gfx-rs/wgpu/issues/3911#issuecomment-2972995675
5252
webgpu:api,validation,render_pass,render_pass_descriptor:attachments,*
53+
webgpu:api,validation,render_pass,render_pass_descriptor:resolveTarget,*
54+
webgpu:api,validation,texture,rg11b10ufloat_renderable:*
5355
webgpu:api,operation,render_pipeline,overrides:*
5456
webgpu:api,operation,rendering,basic:clear:*
5557
webgpu:api,operation,rendering,basic:fullscreen_quad:*

wgpu-types/src/lib.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2958,11 +2958,12 @@ impl TextureFormat {
29582958
storage | binding
29592959
};
29602960
let atomic = attachment | atomic_64;
2961-
let rg11b10f = if device_features.contains(Features::RG11B10UFLOAT_RENDERABLE) {
2962-
attachment
2963-
} else {
2964-
basic
2965-
};
2961+
let (rg11b10f_f, rg11b10f_u) =
2962+
if device_features.contains(Features::RG11B10UFLOAT_RENDERABLE) {
2963+
(msaa_resolve, attachment)
2964+
} else {
2965+
(msaa, basic)
2966+
};
29662967
let (bgra8unorm_f, bgra8unorm) = if device_features.contains(Features::BGRA8UNORM_STORAGE) {
29672968
(
29682969
msaa_resolve | TextureFormatFeatureFlags::STORAGE_WRITE_ONLY,
@@ -3003,7 +3004,7 @@ impl TextureFormat {
30033004
Self::Bgra8UnormSrgb => (msaa_resolve, attachment),
30043005
Self::Rgb10a2Uint => ( msaa, attachment),
30053006
Self::Rgb10a2Unorm => (msaa_resolve, attachment),
3006-
Self::Rg11b10Ufloat => ( msaa, rg11b10f),
3007+
Self::Rg11b10Ufloat => ( rg11b10f_f, rg11b10f_u),
30073008
Self::R64Uint => ( s_ro_wo, atomic_64),
30083009
Self::Rg32Uint => ( s_ro_wo, all_flags),
30093010
Self::Rg32Sint => ( s_ro_wo, all_flags),

0 commit comments

Comments
 (0)