Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify surface creation by introducing new SurfaceTarget enum #4984

Merged
merged 17 commits into from
Jan 12, 2024
Merged

Unify surface creation by introducing new SurfaceTarget enum #4984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift click to select a range
5e8e1b0
introduce SurfaceTarget to unify all surface creation methods on the …
Wumpf Jan 4, 2024
dd79909
use SurfaceTarget within direct & web backend implementations
Wumpf Jan 4, 2024
547bc00
changelog
Wumpf Jan 4, 2024
67c29bf
fix missing #[cfg(metal)] & incorrect canvas passing
Wumpf Jan 4, 2024
25dfb58
improve doc
Wumpf Jan 4, 2024
4d6e75a
changelog pr number update
Wumpf Jan 4, 2024
d178271
warning fix for some platforms
Wumpf Jan 4, 2024
6c9c63a
doc fix
Wumpf Jan 4, 2024
bfc8e7e
fix wasm test compilation
Wumpf Jan 4, 2024
daabb34
Merge branch 'trunk' into better-canvas-handle
Wumpf Jan 4, 2024
0c390f6
split SurfaceTarget into SurfaceTarget & SurfaceTargetUnsafe. backend…
Wumpf Jan 9, 2024
d37c0f6
update changelog
Wumpf Jan 9, 2024
095aa30
Merge branch 'trunk' into better-canvas-handle
Wumpf Jan 9, 2024
ef5abe3
fix incorrect dereference on windows
Wumpf Jan 9, 2024
b666de7
fix webgl crash
Wumpf Jan 10, 2024
656c79a
forward wgpu-core surface creation errors
Wumpf Jan 10, 2024
b5192e8
add SurfaceTargetUnsafe::from_window utility
Wumpf Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix wasm test compilation
  • Loading branch information
@Wumpf
Wumpf committed Jan 4, 2024
commit bfc8e7e39c1991b38a73c7263fe0ffc99d4dab99
2 changes: 1 addition & 1 deletion tests/src/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 51,7 @@ pub async fn initialize_adapter(adapter_index: usize) -> (Instance, Adapter, Opt
let canvas = initialize_html_canvas();

_surface = instance
.create_surface_from_canvas(canvas.clone())
.create_surface(wgpu::SurfaceTarget::Canvas(canvas.clone()))
.expect("could not create surface from canvas");

surface_guard = Some(SurfaceGuard { canvas });
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/create_surface_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 1,6 @@
//! Test that `create_surface_*()` accurately reports those errors we can provoke.

/// This test applies to those cfgs that have a `create_surface_from_canvas` method, which
/// This test applies to those cfgs that can create a surface from a canvas, which
/// include WebGL and WebGPU, but *not* Emscripten GLES.
#[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))]
#[wasm_bindgen_test::wasm_bindgen_test]
Expand All @@ -15,7 15,7 @@ fn canvas_get_context_returned_null() {

#[allow(clippy::redundant_clone)] // false positive — can't and shouldn't move out.
let error = instance
.create_surface_from_canvas(canvas.clone())
.create_surface(wgpu::SurfaceTarget::Canvas(canvas.clone()))
.unwrap_err();

assert!(
Expand Down