From 92288e2988330f1eb9a4a81c7d37d3862c24b590 Mon Sep 17 00:00:00 2001 From: Svenn-Arne Dragly Date: Mon, 15 Jul 2019 13:32:45 +0200 Subject: [PATCH] Add support for indirect drawing --- ffi/wgpu.h | 1 + wgpu-native/src/command/render.rs | 56 +++++++++++++++++++++++++++++++ wgpu-native/src/conv.rs | 3 ++ wgpu-native/src/resource.rs | 1 + 4 files changed, 61 insertions(+) diff --git a/ffi/wgpu.h b/ffi/wgpu.h index b78df368f..73bdcb5d2 100644 --- a/ffi/wgpu.h +++ b/ffi/wgpu.h @@ -424,6 +424,7 @@ typedef uint32_t WGPUBufferUsage; #define WGPUBufferUsage_VERTEX 32 #define WGPUBufferUsage_UNIFORM 64 #define WGPUBufferUsage_STORAGE 128 +#define WGPUBufferUsage_INDIRECT 256 #define WGPUBufferUsage_NONE 0 #define WGPUBufferUsage_WRITE_ALL 2 + 8 + 128 diff --git a/wgpu-native/src/command/render.rs b/wgpu-native/src/command/render.rs index 1a1d28137..87cf13783 100644 --- a/wgpu-native/src/command/render.rs +++ b/wgpu-native/src/command/render.rs @@ -376,6 +376,34 @@ pub extern "C" fn wgpu_render_pass_draw( } } +#[no_mangle] +pub extern "C" fn wgpu_render_pass_draw_indirect( + pass_id: RenderPassId, + indirect_buffer_id: BufferId, + indirect_offset: BufferAddress, +) { + let mut token = Token::root(); + let (mut pass_guard, _) = HUB.render_passes.write(&mut token); + let (buffer_guard, _) = HUB.buffers.read(&mut token); + let pass = &mut pass_guard[pass_id]; + pass.is_ready().unwrap(); + + let buffer = pass + .trackers + .buffers + .use_extend(&*buffer_guard, indirect_buffer_id, (), BufferUsage::INDIRECT) + .unwrap(); + + unsafe { + pass.raw.draw_indirect( + &buffer.raw, + indirect_offset, + 1, + 0 + ); + } +} + #[no_mangle] pub extern "C" fn wgpu_render_pass_draw_indexed( pass_id: RenderPassId, @@ -403,6 +431,34 @@ pub extern "C" fn wgpu_render_pass_draw_indexed( } } +#[no_mangle] +pub extern "C" fn wgpu_render_pass_draw_indexed_indirect( + pass_id: RenderPassId, + indirect_buffer_id: BufferId, + indirect_offset: BufferAddress, +) { + let mut token = Token::root(); + let (mut pass_guard, _) = HUB.render_passes.write(&mut token); + let (buffer_guard, _) = HUB.buffers.read(&mut token); + let pass = &mut pass_guard[pass_id]; + pass.is_ready().unwrap(); + + let buffer = pass + .trackers + .buffers + .use_extend(&*buffer_guard, indirect_buffer_id, (), BufferUsage::INDIRECT) + .unwrap(); + + unsafe { + pass.raw.draw_indexed_indirect( + &buffer.raw, + indirect_offset, + 1, + 0 + ); + } +} + #[no_mangle] pub extern "C" fn wgpu_render_pass_set_pipeline( pass_id: RenderPassId, diff --git a/wgpu-native/src/conv.rs b/wgpu-native/src/conv.rs index 5641a4fbe..815afb797 100644 --- a/wgpu-native/src/conv.rs +++ b/wgpu-native/src/conv.rs @@ -34,6 +34,9 @@ pub fn map_buffer_usage( if usage.contains(W::STORAGE) { hal_usage |= U::STORAGE; } + if usage.contains(W::INDIRECT) { + hal_usage |= U::INDIRECT; + } (hal_usage, hal_memory) } diff --git a/wgpu-native/src/resource.rs b/wgpu-native/src/resource.rs index ed3a8c400..dfe7530e1 100644 --- a/wgpu-native/src/resource.rs +++ b/wgpu-native/src/resource.rs @@ -29,6 +29,7 @@ bitflags! { const VERTEX = 32; const UNIFORM = 64; const STORAGE = 128; + const INDIRECT = 256; const NONE = 0; const WRITE_ALL = 2 + 8 + 128; }