Skip to content

Commit 175a7f5

Browse files
authored
Fix DLSS by upgrading dlss_wgpu to 4.0.0-dev (#22768)
Actually fixes #22707!
1 parent 727a350 commit 175a7f5

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

crates/bevy_anti_alias/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ bevy_post_process = { path = "../bevy_post_process", version = "0.19.0-dev" }
3535

3636
# other
3737
tracing = { version = "0.1", default-features = false, features = ["std"] }
38-
dlss_wgpu = { version = "3", optional = true }
38+
dlss_wgpu = { version = "4.0.0-dev", optional = true }
3939
uuid = { version = "1", optional = true }
4040

4141
[lints]

crates/bevy_anti_alias/src/dlss/mod.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,23 +265,25 @@ impl DlssFeature for DlssSuperResolutionFeature {
265265
type Context = DlssSuperResolution;
266266

267267
fn upscaled_resolution(context: &Self::Context) -> UVec2 {
268-
context.upscaled_resolution()
268+
context.upscaled_resolution().into()
269269
}
270270

271271
fn render_resolution(context: &Self::Context) -> UVec2 {
272-
context.render_resolution()
272+
context.render_resolution().into()
273273
}
274274

275275
fn suggested_jitter(
276276
context: &Self::Context,
277277
frame_number: u32,
278278
render_resolution: UVec2,
279279
) -> Vec2 {
280-
context.suggested_jitter(frame_number, render_resolution)
280+
context
281+
.suggested_jitter(frame_number, render_resolution.to_array())
282+
.into()
281283
}
282284

283285
fn suggested_mip_bias(context: &Self::Context, render_resolution: UVec2) -> f32 {
284-
context.suggested_mip_bias(render_resolution)
286+
context.suggested_mip_bias(render_resolution.to_array())
285287
}
286288

287289
fn new_context(
@@ -293,7 +295,7 @@ impl DlssFeature for DlssSuperResolutionFeature {
293295
queue: &RenderQueue,
294296
) -> Result<Self::Context, dlss_wgpu::DlssError> {
295297
DlssSuperResolution::new(
296-
upscaled_resolution,
298+
upscaled_resolution.to_array(),
297299
perf_quality_mode,
298300
feature_flags,
299301
sdk,
@@ -313,23 +315,25 @@ impl DlssFeature for DlssRayReconstructionFeature {
313315
type Context = DlssRayReconstruction;
314316

315317
fn upscaled_resolution(context: &Self::Context) -> UVec2 {
316-
context.upscaled_resolution()
318+
context.upscaled_resolution().into()
317319
}
318320

319321
fn render_resolution(context: &Self::Context) -> UVec2 {
320-
context.render_resolution()
322+
context.render_resolution().into()
321323
}
322324

323325
fn suggested_jitter(
324326
context: &Self::Context,
325327
frame_number: u32,
326328
render_resolution: UVec2,
327329
) -> Vec2 {
328-
context.suggested_jitter(frame_number, render_resolution)
330+
context
331+
.suggested_jitter(frame_number, render_resolution.to_array())
332+
.into()
329333
}
330334

331335
fn suggested_mip_bias(context: &Self::Context, render_resolution: UVec2) -> f32 {
332-
context.suggested_mip_bias(render_resolution)
336+
context.suggested_mip_bias(render_resolution.to_array())
333337
}
334338

335339
fn new_context(
@@ -341,7 +345,7 @@ impl DlssFeature for DlssRayReconstructionFeature {
341345
queue: &RenderQueue,
342346
) -> Result<Self::Context, dlss_wgpu::DlssError> {
343347
DlssRayReconstruction::new(
344-
upscaled_resolution,
348+
upscaled_resolution.to_array(),
345349
perf_quality_mode,
346350
feature_flags,
347351
DlssRayReconstructionRoughnessMode::Packed,

crates/bevy_anti_alias/src/dlss/node.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ pub fn dlss_super_resolution(
5050
bias: None, // TODO
5151
dlss_output: &view_target.destination,
5252
reset: dlss.reset,
53-
jitter_offset: -temporal_jitter.offset,
54-
partial_texture_size: Some(render_resolution),
55-
motion_vector_scale: Some(-render_resolution.as_vec2()),
53+
jitter_offset: (-temporal_jitter.offset).to_array(),
54+
partial_texture_size: Some(render_resolution.to_array()),
55+
motion_vector_scale: Some((-render_resolution.as_vec2()).to_array()),
5656
};
5757

5858
let diagnostics = ctx.diagnostic_recorder();
@@ -117,9 +117,9 @@ pub fn dlss_ray_reconstruction(
117117
bias: None, // TODO
118118
dlss_output: &view_target.destination,
119119
reset: dlss.reset,
120-
jitter_offset: -temporal_jitter.offset,
121-
partial_texture_size: Some(render_resolution),
122-
motion_vector_scale: Some(-render_resolution.as_vec2()),
120+
jitter_offset: (-temporal_jitter.offset).to_array(),
121+
partial_texture_size: Some(render_resolution.to_array()),
122+
motion_vector_scale: Some((-render_resolution.as_vec2()).to_array()),
123123
};
124124

125125
let diagnostics = ctx.diagnostic_recorder();

0 commit comments

Comments
 (0)