Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: aclysma/skulpin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: everdrone/skulpin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 7 files changed
  • 1 contributor

Commits on Apr 3, 2023

  1. Copy the full SHA
    f59a525 View commit details
Showing with 12 additions and 8 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 Cargo.toml
  3. +3 −2 skulpin-app-winit/Cargo.toml
  4. +1 −1 skulpin-app-winit/src/app.rs
  5. +2 −0 skulpin-app-winit/src/lib.rs
  6. +2 −2 skulpin-renderer/Cargo.toml
  7. +1 −1 skulpin-renderer/src/skia_support.rs
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@
**/*.rs.bk
Cargo.lock
.idea
.vscode
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ winit-22 = ["skulpin-app-winit/winit-22"]
winit-23 = ["skulpin-app-winit/winit-23"]
winit-24 = ["skulpin-app-winit/winit-24"]
winit-25 = ["skulpin-app-winit/winit-25"]
winit-28 = ["skulpin-app-winit/winit-28"]
winit-latest = ["skulpin-app-winit/winit-latest"]

default = []
@@ -86,9 +87,8 @@ required-features = []

[[example]]
name = "interactive_winit_app"
required-features = ["winit-app", "winit-25"]
required-features = ["winit-app", "winit-28"]

[[example]]
name = "physics"
required-features = ["winit-app", "winit-25"]

5 changes: 3 additions & 2 deletions skulpin-app-winit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -22,7 +22,8 @@ winit-22 = { package = "winit", version = "0.22", optional = true }
winit-23 = { package = "winit", version = "0.23", optional = true }
winit-24 = { package = "winit", version = "0.24", optional = true }
winit-25 = { package = "winit", version = "0.25", optional = true }
winit-latest = { package = "winit", version = ">=0.23", optional = true }
raw-window-handle = "0.3"
winit-28 = { package = "winit", version = "0.28", optional = true }
winit-latest = { package = "winit", version = ">=0.28", optional = true }
raw-window-handle = "0.5"

[features]
2 changes: 1 addition & 1 deletion skulpin-app-winit/src/app.rs
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@ impl App {
renderer_builder: RendererBuilder,
) -> ! {
// Create the event loop
let event_loop = winit::event_loop::EventLoop::<()>::with_user_event();
let event_loop = winit::event_loop::EventLoopBuilder::<T>::with_user_event().build();

let winit_size = match inner_size {
Size::Physical(physical_size) => winit::dpi::Size::Physical(
2 changes: 2 additions & 0 deletions skulpin-app-winit/src/lib.rs
Original file line number Diff line number Diff line change
@@ -49,5 +49,7 @@ pub use winit_23 as winit;
pub use winit_24 as winit;
#[cfg(feature = "winit-25")]
pub use winit_25 as winit;
#[cfg(feature = "winit-28")]
pub use winit_28 as winit;
#[cfg(feature = "winit-latest")]
pub use winit_latest as winit;
4 changes: 2 additions & 2 deletions skulpin-renderer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ rafx = { version = "=0.0.14", features = ["rafx-vulkan", "framework"] }
bincode = "1.3.1"
lazy_static = "1"

skia-safe = { version = "0.57.0", features = ["vulkan"] }
skia-bindings = { version = "0.57.0" }
skia-safe = { version = "0.60.0", features = ["vulkan"] }
skia-bindings = { version = "0.60.0" }

log="0.4"
2 changes: 1 addition & 1 deletion skulpin-renderer/src/skia_support.rs
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ impl VkSkiaSurface {

let mut surface = skia_safe::Surface::new_render_target(
&mut context.context,
skia_safe::Budgeted::Yes,
skia_safe::gpu::Budgeted::Yes,
&image_info,
None,
skia_safe::gpu::SurfaceOrigin::TopLeft,