diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1a39b463..78bde672 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,10 +12,8 @@
-
-
+
-
@@ -58,39 +56,39 @@
- {
- "keyToString": {
- "Cargo.Build `Test back::wgsl::test::test_into`.executor": "Run",
- "Cargo.Build `Test reflect::cross::test::test_into`.executor": "Run",
- "Cargo.Test back::wgsl::test::test_into.executor": "Run",
- "Cargo.Test front::naga::test::naga_playground (1).executor": "Run",
- "Cargo.Test front::naga::test::naga_playground.executor": "Run",
- "Cargo.Test reflect::cross::test::test_into.executor": "Run",
- "Cargo.Test triangle_d3d11.executor": "Run",
- "Cargo.Test triangle_d3d12.executor": "Run",
- "Cargo.Test triangle_gl.executor": "Run",
- "Cargo.Test triangle_gl46.executor": "Run",
- "Cargo.Test triangle_vk.executor": "Run",
- "Cargo.Test triangle_wgpu.executor": "Run",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.RadMigrateCodeStyle": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.cidr.known.project.marker": "true",
- "RunOnceActivity.readMode.enableVisualFormatting": "true",
- "cf.first.check.clang-format": "false",
- "cidr.known.project.marker": "true",
- "git-widget-placeholder": "feat-wgpu-runtime",
- "last_opened_file_path": "C:/coding/librashader",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",
- "settings.editor.selected.configurable": "language.rust",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
@@ -266,7 +264,8 @@
-
+
+
@@ -316,7 +315,23 @@
1702514856945
-
+
+
+ 1702561653875
+
+
+
+ 1702561653875
+
+
+
+ 1702562564811
+
+
+
+ 1702562564811
+
+
@@ -330,7 +345,9 @@
-
+
+
+
diff --git a/Cargo.lock b/Cargo.lock
index a03c047d..f4f32a88 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1830,6 +1830,7 @@ dependencies = [
name = "librashader-runtime-wgpu"
version = "0.1.0"
dependencies = [
+ "array-concat",
"bytemuck",
"config",
"env_logger",
diff --git a/librashader-common/src/wgpu.rs b/librashader-common/src/wgpu.rs
index fa442384..e5a8272e 100644
--- a/librashader-common/src/wgpu.rs
+++ b/librashader-common/src/wgpu.rs
@@ -175,3 +175,13 @@ impl From for wgpu_types::AddressMode {
}
}
}
+
+impl From> for wgpu_types::Extent3d {
+ fn from(value: Size) -> Self {
+ wgpu_types::Extent3d {
+ width: value.width,
+ height: value.height,
+ depth_or_array_layers: 1,
+ }
+ }
+}
\ No newline at end of file
diff --git a/librashader-runtime-vk/src/filter_pass.rs b/librashader-runtime-vk/src/filter_pass.rs
index 67dcb92f..50a085b6 100644
--- a/librashader-runtime-vk/src/filter_pass.rs
+++ b/librashader-runtime-vk/src/filter_pass.rs
@@ -126,7 +126,7 @@ impl FilterPass {
let residual = self
.graphics_pipeline
- .begin_rendering(&parent.device, output, cmd)?;
+ .begin_rendering(output, cmd)?;
unsafe {
parent.device.cmd_bind_pipeline(
@@ -178,7 +178,7 @@ impl FilterPass {
.device
.cmd_set_viewport(cmd, 0, &[output.output.size.into()]);
parent.draw_quad.draw_quad(cmd, vbo_type);
- self.graphics_pipeline.end_rendering(&parent.device, cmd);
+ self.graphics_pipeline.end_rendering(cmd);
}
Ok(residual)
}
diff --git a/librashader-runtime-vk/src/graphics_pipeline.rs b/librashader-runtime-vk/src/graphics_pipeline.rs
index ceac83e5..6ffb54ac 100644
--- a/librashader-runtime-vk/src/graphics_pipeline.rs
+++ b/librashader-runtime-vk/src/graphics_pipeline.rs
@@ -384,14 +384,13 @@ impl VulkanGraphicsPipeline {
#[inline(always)]
pub(crate) fn begin_rendering(
&self,
- device: &ash::Device,
output: &RenderTarget,
cmd: vk::CommandBuffer,
) -> error::Result