mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 22:11:01 +01:00
[core-remote] remove non-ided RenderBundleEncoder methods from global
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
1 parent
ff8eeccc33
commit
900a099ccf
2 files changed
+8
-161
No files matched your search
@@ -1,22 +1,8 @@
|
||||
use crate::id;
|
||||
use wgpu_core::command::{PassStateError, RenderBundleEncoder};
|
||||
use wgpu_core::command::PassStateError;
|
||||
|
||||
impl crate::global::Global {
|
||||
pub fn render_bundle_encoder_set_bind_group(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
index: u32,
|
||||
bind_group_id: Option<id::BindGroupId>,
|
||||
offsets: &[wgt::DynamicOffset],
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.set_bind_group(
|
||||
index,
|
||||
bind_group_id.map(|id| self.hub.bind_groups.get(id)),
|
||||
offsets,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_bind_group_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
index: u32,
|
||||
@@ -37,14 +23,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_pipeline(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
pipeline_id: id::RenderPipelineId,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.set_pipeline(self.hub.render_pipelines.get(pipeline_id))
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_pipeline_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
pipeline_id: id::RenderPipelineId,
|
||||
@@ -59,22 +37,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_vertex_buffer(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
slot: u32,
|
||||
buffer_id: Option<id::BufferId>,
|
||||
offset: wgt::BufferAddress,
|
||||
size: Option<wgt::BufferSize>,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.set_vertex_buffer(
|
||||
slot,
|
||||
buffer_id.map(|id| self.hub.buffers.get(id)),
|
||||
offset,
|
||||
size,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_vertex_buffer_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
slot: u32,
|
||||
@@ -97,17 +59,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_index_buffer(
|
||||
&self,
|
||||
encoder: &mut RenderBundleEncoder,
|
||||
buffer: id::BufferId,
|
||||
index_format: wgt::IndexFormat,
|
||||
offset: wgt::BufferAddress,
|
||||
size: Option<wgt::BufferSize>,
|
||||
) -> Result<(), PassStateError> {
|
||||
encoder.set_index_buffer(self.hub.buffers.get(buffer), index_format, offset, size)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_index_buffer_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
buffer: id::BufferId,
|
||||
@@ -125,15 +76,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_immediates(
|
||||
&self,
|
||||
pass: &mut RenderBundleEncoder,
|
||||
offset: u32,
|
||||
data: &[u8],
|
||||
) -> Result<(), PassStateError> {
|
||||
pass.set_immediates(offset, data)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_set_immediates_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
offset: u32,
|
||||
@@ -149,17 +91,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
vertex_count: u32,
|
||||
instance_count: u32,
|
||||
first_vertex: u32,
|
||||
first_instance: u32,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.draw(vertex_count, instance_count, first_vertex, first_instance)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
vertex_count: u32,
|
||||
@@ -177,24 +108,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_indexed(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
index_count: u32,
|
||||
instance_count: u32,
|
||||
first_index: u32,
|
||||
base_vertex: i32,
|
||||
first_instance: u32,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.draw_indexed(
|
||||
index_count,
|
||||
instance_count,
|
||||
first_index,
|
||||
base_vertex,
|
||||
first_instance,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_indexed_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
index_count: u32,
|
||||
@@ -219,15 +132,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_indirect(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
buffer_id: id::BufferId,
|
||||
offset: wgt::BufferAddress,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.draw_indirect(self.hub.buffers.get(buffer_id), offset)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_indirect_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
buffer_id: id::BufferId,
|
||||
@@ -243,15 +147,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_indexed_indirect(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
buffer_id: id::BufferId,
|
||||
offset: wgt::BufferAddress,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.draw_indexed_indirect(self.hub.buffers.get(buffer_id), offset)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_draw_indexed_indirect_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
buffer_id: id::BufferId,
|
||||
@@ -267,14 +162,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_push_debug_group(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
label: &str,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.push_debug_group(label)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_push_debug_group_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
label: &str,
|
||||
@@ -289,13 +176,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_pop_debug_group(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.pop_debug_group()
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_pop_debug_group_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
) -> Result<(), PassStateError> {
|
||||
@@ -309,14 +189,6 @@ impl crate::global::Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_insert_debug_marker(
|
||||
&self,
|
||||
bundle: &mut RenderBundleEncoder,
|
||||
label: &str,
|
||||
) -> Result<(), PassStateError> {
|
||||
bundle.insert_debug_marker(label)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_insert_debug_marker_with_id(
|
||||
&self,
|
||||
bundle_encoder: id::RenderBundleEncoderId,
|
||||
label: &str,
|
||||
|
||||
@@ -704,18 +704,6 @@ impl Global {
|
||||
&self,
|
||||
device_id: DeviceId,
|
||||
desc: &command::RenderBundleEncoderDescriptor,
|
||||
) -> (
|
||||
Box<command::RenderBundleEncoder>,
|
||||
Option<command::CreateRenderBundleError>,
|
||||
) {
|
||||
let device = self.hub.devices.get(device_id);
|
||||
device.create_render_bundle_encoder(desc)
|
||||
}
|
||||
|
||||
pub fn device_create_render_bundle_encoder_with_id(
|
||||
&self,
|
||||
device_id: DeviceId,
|
||||
desc: &command::RenderBundleEncoderDescriptor,
|
||||
id_in: Option<id::RenderBundleEncoderId>,
|
||||
) -> (
|
||||
id::RenderBundleEncoderId,
|
||||
@@ -723,8 +711,8 @@ impl Global {
|
||||
) {
|
||||
let fid = self.hub.render_bundle_encoders.prepare(id_in);
|
||||
|
||||
let (render_bundle_encoder, error) =
|
||||
self.device_create_render_bundle_encoder(device_id, desc);
|
||||
let device = self.hub.devices.get(device_id);
|
||||
let (render_bundle_encoder, error) = device.create_render_bundle_encoder(desc);
|
||||
|
||||
// no lock rank here because only one thread should be using compute pass
|
||||
// and it's only used by id variants of compute pass methods on global
|
||||
@@ -735,23 +723,6 @@ impl Global {
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_finish(
|
||||
&self,
|
||||
bundle_encoder: &mut command::RenderBundleEncoder,
|
||||
desc: &command::RenderBundleDescriptor,
|
||||
id_in: Option<id::RenderBundleId>,
|
||||
) -> (id::RenderBundleId, Option<command::RenderBundleError>) {
|
||||
let hub = &self.hub;
|
||||
|
||||
let fid = hub.render_bundles.prepare(id_in);
|
||||
|
||||
let (render_bundle, error) = bundle_encoder.finish(desc);
|
||||
|
||||
let id = fid.assign(render_bundle);
|
||||
|
||||
(id, error)
|
||||
}
|
||||
|
||||
pub fn render_bundle_encoder_finish_with_id(
|
||||
&self,
|
||||
render_bundle_encoder_id: id::RenderBundleEncoderId,
|
||||
desc: &command::RenderBundleDescriptor,
|
||||
@@ -766,7 +737,11 @@ impl Global {
|
||||
.try_lock()
|
||||
.expect("RenderBundleEncoders should not be accessed concurrently");
|
||||
|
||||
let (id, error) = self.render_bundle_encoder_finish(&mut bundle_encoder, desc, id_in);
|
||||
let fid = self.hub.render_bundles.prepare(id_in);
|
||||
|
||||
let (render_bundle, error) = bundle_encoder.finish(desc);
|
||||
|
||||
let id = fid.assign(render_bundle);
|
||||
|
||||
(id, error)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user