Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
182 changes: 10 additions & 172 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,6 @@ libc = "0.2.180"
dng = "1.5"
async-stream = "0.3"

# Separate wgpu for compute pipelines (independent from libcosmic's wgpu for UI)
# This allows us to use the latest wgpu features like open_with_callback for low-priority queues
[dependencies.wgpu-compute]
package = "wgpu"
version = "27.0.1"
default-features = false
features = ["vulkan", "wgsl"]

# Vulkan bindings for VK_EXT_global_priority support
# Must match the version used by wgpu-hal
[dependencies.ash]
version = "0.38"

[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"
# See https://github.com/pop-os/libcosmic/blob/master/Cargo.toml for available features.
Expand Down
10 changes: 5 additions & 5 deletions src/backends/virtual_camera/gpu_filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ impl GpuFilterRenderer {
label: Some("vcam_filter_pipeline"),
layout: Some(&pipeline_layout),
module: &shader,
entry_point: Some("main"),
entry_point: "main",
compilation_options: Default::default(),
cache: None,
});
Expand Down Expand Up @@ -245,14 +245,14 @@ impl GpuFilterRenderer {

// Upload RGBA data
self.queue.write_texture(
wgpu::TexelCopyTextureInfo {
wgpu::ImageCopyTexture {
texture: texture_rgba,
mip_level: 0,
origin: wgpu::Origin3d::ZERO,
aspect: wgpu::TextureAspect::All,
},
&frame.data,
wgpu::TexelCopyBufferLayout {
wgpu::ImageDataLayout {
offset: 0,
bytes_per_row: Some(frame.stride),
rows_per_image: None,
Expand Down Expand Up @@ -314,7 +314,7 @@ impl GpuFilterRenderer {
timestamp_writes: None,
});
pass.set_pipeline(&self.pipeline);
pass.set_bind_group(0, Some(&bind_group), &[]);
pass.set_bind_group(0, &bind_group, &[]);
let workgroups_x = frame.width.div_ceil(16);
let workgroups_y = frame.height.div_ceil(16);
pass.dispatch_workgroups(workgroups_x, workgroups_y, 1);
Expand Down Expand Up @@ -342,7 +342,7 @@ impl GpuFilterRenderer {
let _ = tx.send(result);
});

let _ = self.device.poll(wgpu::PollType::wait_indefinitely());
let _ = self.device.poll(wgpu::Maintain::Wait);

rx.recv()
.map_err(|e| BackendError::Other(format!("Failed to map buffer: {}", e)))?
Expand Down
Loading