github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix API traced dynamic offsets and object labels

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-01-04 17:54:32 -05:00
parent 66c987b226
commit d70148725b
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wgpu-core/src/command/compute.rs
View File

@@ -230,7 +230,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
pub fn command_encoder_run_compute_pass_impl<B: GfxBackend>(
&self,
encoder_id: id::CommandEncoderId,
mut base: BasePassRef<ComputeCommand>,
base: BasePassRef<ComputeCommand>,
) -> Result<(), ComputePassError> {
span!(_guard, INFO, "CommandEncoder::run_compute_pass");
let scope = PassErrorScope::Pass(encoder_id);
@@ -270,6 +270,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
debug_scope_depth: 0,
};
let mut temp_offsets = Vec::new();
let mut dynamic_offset_count = 0;
let mut string_offset = 0;
for command in base.commands {
match *command {
@@ -290,9 +292,11 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
temp_offsets.clear();
temp_offsets
.extend_from_slice(&base.dynamic_offsets[..num_dynamic_offsets as usize]);
base.dynamic_offsets = &base.dynamic_offsets[num_dynamic_offsets as usize..];
temp_offsets.extend_from_slice(
&base.dynamic_offsets[dynamic_offset_count
..dynamic_offset_count + (num_dynamic_offsets as usize)],
);
dynamic_offset_count += num_dynamic_offsets as usize;
let bind_group = cmd_buf
.trackers
@@ -488,12 +492,13 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
ComputeCommand::PushDebugGroup { color, len } => {
state.debug_scope_depth += 1;
let label = str::from_utf8(&base.string_data[..len]).unwrap();
let label =
str::from_utf8(&base.string_data[string_offset..string_offset + len])
.unwrap();
string_offset += len;
unsafe {
raw.begin_debug_marker(label, color);
}
base.string_data = &base.string_data[len..];
}
ComputeCommand::PopDebugGroup => {
let scope = PassErrorScope::PopDebugGroup;
@@ -508,9 +513,11 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
}
ComputeCommand::InsertDebugMarker { color, len } => {
let label = str::from_utf8(&base.string_data[..len]).unwrap();
let label =
str::from_utf8(&base.string_data[string_offset..string_offset + len])
.unwrap();
string_offset += len;
unsafe { raw.insert_debug_marker(label, color) }
base.string_data = &base.string_data[len..];
}
}
}

22
wgpu-core/src/command/render.rs
View File

@@ -1059,7 +1059,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
pub fn command_encoder_run_render_pass_impl<B: GfxBackend>(
&self,
encoder_id: id::CommandEncoderId,
mut base: BasePassRef<RenderCommand>,
base: BasePassRef<RenderCommand>,
color_attachments: &[ColorAttachmentDescriptor],
depth_stencil_attachment: Option<&DepthStencilAttachmentDescriptor>,
) -> Result<(), RenderPassError> {
@@ -1121,6 +1121,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
debug_scope_depth: 0,
};
let mut temp_offsets = Vec::new();
let mut dynamic_offset_count = 0;
let mut string_offset = 0;
for command in base.commands {
match *command {
@@ -1141,10 +1143,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
temp_offsets.clear();
temp_offsets.extend_from_slice(
&base.dynamic_offsets[..num_dynamic_offsets as usize],
&base.dynamic_offsets[dynamic_offset_count
..dynamic_offset_count + (num_dynamic_offsets as usize)],
);
base.dynamic_offsets =
&base.dynamic_offsets[num_dynamic_offsets as usize..];
dynamic_offset_count += num_dynamic_offsets as usize;
let bind_group = info
.trackers
@@ -1748,11 +1750,13 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
RenderCommand::PushDebugGroup { color, len } => {
state.debug_scope_depth += 1;
let label = str::from_utf8(&base.string_data[..len]).unwrap();
let label =
str::from_utf8(&base.string_data[string_offset..string_offset + len])
.unwrap();
string_offset += len;
unsafe {
raw.begin_debug_marker(label, color);
}
base.string_data = &base.string_data[len..];
}
RenderCommand::PopDebugGroup => {
let scope = PassErrorScope::PopDebugGroup;
@@ -1766,11 +1770,13 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
}
}
RenderCommand::InsertDebugMarker { color, len } => {
let label = str::from_utf8(&base.string_data[..len]).unwrap();
let label =
str::from_utf8(&base.string_data[string_offset..string_offset + len])
.unwrap();
string_offset += len;
unsafe {
raw.insert_debug_marker(label, color);
}
base.string_data = &base.string_data[len..];
}
RenderCommand::ExecuteBundle(bundle_id) => {
let scope = PassErrorScope::ExecuteBundle;