dan/cushy
1
0
Fork 0
mirror of https://github.com/danbulant/cushy synced 2026-07-08 04:30:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating Kludgine for wgpu

Browse source 
The dependence on git is just to let CI run before releasing a kludgine
update with wgpu 22.0.0 support.
This commit is contained in:
Jonathan Johnson 2024-07-22 07:19:58 -07:00
parent fbabbdbd99
commit 553c4ab959
No known key found for this signature in database
GPG key ID: A66D6A34D6620579
3 changed files with 519 additions and 369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

869
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
Cargo.toml
View file

@ -22,8 +22,10 @@ tokio = ["dep:tokio"]
tokio-multi-thread = ["tokio", "tokio/rt-multi-thread"] tokio-multi-thread = ["tokio", "tokio/rt-multi-thread"]
[dependencies] [dependencies]
kludgine = { version = "0.8.0", features = ["app"] } kludgine = { git = "https://github.com/khonsulabs/kludgine", features = [
figures = { version = "0.3.0" } "app",
] }
figures = { git = "https://github.com/khonsulabs/figures" }
alot = "0.3" alot = "0.3"
interner = "0.2.1" interner = "0.2.1"
kempt = "0.2.1" kempt = "0.2.1"

13
src/window.rs
View file

@ -1795,6 +1795,10 @@ where
context.settings.borrow().multisample_count context.settings.borrow().multisample_count
} }
fn memory_hints(_context: &Self::Context) -> wgpu::MemoryHints {
wgpu::MemoryHints::MemoryUsage
}
fn focus_changed( fn focus_changed(
&mut self, &mut self,
window: kludgine::app::Window<'_, WindowCommand>, window: kludgine::app::Window<'_, WindowCommand>,
@ -2667,7 +2671,7 @@ impl CushyWindow {
/// commands were submitted. /// commands were submitted.
pub fn render( pub fn render(
&mut self, &mut self,
pass: &wgpu::RenderPassDescriptor<'_, '_>, pass: &wgpu::RenderPassDescriptor<'_>,
device: &wgpu::Device, device: &wgpu::Device,
queue: &wgpu::Queue, queue: &wgpu::Queue,
) -> Option<wgpu::SubmissionIndex> { ) -> Option<wgpu::SubmissionIndex> {
@ -2680,7 +2684,7 @@ impl CushyWindow {
/// commands were submitted. /// commands were submitted.
pub fn render_with( pub fn render_with(
&mut self, &mut self,
pass: &wgpu::RenderPassDescriptor<'_, '_>, pass: &wgpu::RenderPassDescriptor<'_>,
device: &wgpu::Device, device: &wgpu::Device,
queue: &wgpu::Queue, queue: &wgpu::Queue,
additional_drawing: Option<&Drawing>, additional_drawing: Option<&Drawing>,
@ -2876,7 +2880,7 @@ impl VirtualWindow {
/// commands were submitted. /// commands were submitted.
pub fn render( pub fn render(
&mut self, &mut self,
pass: &wgpu::RenderPassDescriptor<'_, '_>, pass: &wgpu::RenderPassDescriptor<'_>,
device: &wgpu::Device, device: &wgpu::Device,
queue: &wgpu::Queue, queue: &wgpu::Queue,
) -> Option<wgpu::SubmissionIndex> { ) -> Option<wgpu::SubmissionIndex> {
@ -2889,7 +2893,7 @@ impl VirtualWindow {
/// commands were submitted. /// commands were submitted.
pub fn render_with( pub fn render_with(
&mut self, &mut self,
pass: &wgpu::RenderPassDescriptor<'_, '_>, pass: &wgpu::RenderPassDescriptor<'_>,
device: &wgpu::Device, device: &wgpu::Device,
queue: &wgpu::Queue, queue: &wgpu::Queue,
additional_drawing: Option<&Drawing>, additional_drawing: Option<&Drawing>,
@ -3298,6 +3302,7 @@ where
label: None, label: None,
required_features: Kludgine::REQURED_FEATURES, required_features: Kludgine::REQURED_FEATURES,
required_limits: Kludgine::adjust_limits(wgpu::Limits::downlevel_webgl2_defaults()), required_limits: Kludgine::adjust_limits(wgpu::Limits::downlevel_webgl2_defaults()),
memory_hints: wgpu::MemoryHints::MemoryUsage,
}, },
None, None,
))?; ))?;