mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 06:50:59 +01:00
* fix more compile errors * fix err * fix all compile errors * fix clippy errors * fix issues in ray-traced-triangle example * fix clippy warnings * fix wasm not compiling * fix test * fix clippy (again) * fix some rustfmt issues * fix more rustfmt issues * fix even more rustfmt issues * fix yet more rustfmt issues * add #[allow(dead_code)] to some structs to fix clippy on web assembly * more format fixes * even more format fixes * close to final format fixes * final format fixes (hopefully) * actual final format fixes (hopefully) * move ray_cube_cube example and fix bugs * move other examples * fix crash when dropping * fix test * apply clippy and rustfmt changes * fix some memory leaks * fix incompatibility with new wgpu trunk changes * fix clippy & fmt * fix clippy errors on github * update to trunk * remove a line that printed log "Created blas ..." in device create tlas * fix merge issues * fix merge * fix fmt * restored example ray scene functionality * WIP fix rebase * Fix compile issues * More fixes * Fix rebase * Add wgls backend write_value_type AccelerationStructure * Add back xtask Cargo.lock * Revert serde path * Doc typos * Add -diff * Revert more serde * Revert serde again? * Fix doc typo * add test * clippy & fmt * fix error "blas does not exist" * fix various things * fix unused acceleration structures causing invalid SPIR-V * fix merge * fix use after free in a different way (now moved tlas instances to wgpu_core) * refactor & fmt * remove accidentally created file * remove accidentally created file (actually) * merge & fix * Fix problems * fix validation error * fix validation * fix merge * fmt * fix merge * use staging buffer trackers in creating the ray-tracing staging buffers (not the tlas_s) * change one missed staging buffer's tracker * wip: example * finished shadow! * fix merge * clippy * remove some uses of blas ids * fmt * fix merge * deduplicate code shared between command_encoder_build_acceleration_structures and command_encoder_build_acceleration_structures_unsafe_tlas * clippy * fix merge * fix warnings * clippy & fmt * re-add matching to get_raw_tlas_instance_size and tlas_instance_into_bytes * fmt * fix command * wip: fix merge * fix merge * fmt & docs * fix wasm clippy * fix issues with tests * fix issues with tests * fmt & clippy (wasm) * wip ray-traced-triangle (non hal) * unify camera location in ray_shadows * fix tests * add readme to ray_traced_triangle * note that vertex format must be f32x3 (not yet validated) * changelog * require VertexFormat::Float32x3 * fix compile error * when creating and building acceleration structures require Features::RAY_TRACING_ACCELERATION_STRUCTURE is enabled * remove duplicate workaround * fix most feedback * remove all changes from .gitattributes * fix compile error in test * more changes along same lines * format * apply feedback to more places * fix `cargo clippy` not just `cargo clippy --all-features` * cache max instances from tlas creation * fix clippy * fix examples * fix tests * remove now useless docs * add more docs * yet more docs * still more docs * Documentation. * Running out of unique commit messages to say writing docs. * Add more references to docs. * Get BindGroup in scope * Remove unintentional changes * Remove #[allow(dead_code)] * Remove old comments * Add device.poll * make ray_scene start right way up * fmt * move scratch buffer to its own module * actually remove intentional changes (turns out wgt is inconsistent) * use better names in ray_scene/shader.wgsl * fmt * remove more unintentional changes. * work on ray_tracing use after free * spelling Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com> * grammar Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com> * move things into struct (should be all vectors with 3 item types or more) * remove long-standing locks. * fmt * move not using index buffer to test * impl index & index mut for tlas package * impl index & index mut for tlas package * fix errors * fix test errors * move everything out of ray_tracing.rs * more index_mut * fmt * fix docs links * move to separate impl block * fix older request review * fmt * remove missed deref * fix wasm clippy * change to suggestions * fmt * add a note as to why `command_encoder_build_acceleration_structures_unsafe_tlas` and `command_encoder_build_acceleration_structures` are currently separate * add a todo to reconsider soon `command_encoder_build_acceleration_structures_unsafe_tlas` * switch to mat4 in ray-tracing examples * Combine RT Tests Under Single Submodule * Add More Raytracing Tests and Re-Organize * Documentation and Formatting Fixes * Remove Forced Alignment in wgpu-hal * work on out_of_order_as_build and add out_of_order_as_build_use * fmt * update test label naming * fix one validation error * fix clippy & fmt * add acceleration structure creation tests * make mis-matched index test use the correct function * move validation into validate_command_buffer * fix tests * add blas and tlas to pending writes to remove (now unneeded) `device.poll()`s * remove commented out code from examples and properly use the constants in ray_shadow * add examples to examples\README.md * rename ray tracing to ray queries in readme * remove unneeded usage from scratch buffer creation * use snatchables for raw acceleration structures * format * add EXPERIMENTAL_ to features * fix missed comment --------- Co-authored-by: Daniel Keitel <daniel.mg.keitel@fau.de> Co-authored-by: JMS55 <47158642+JMS55@users.noreply.github.com> Co-authored-by: atlas dostal <rodol@rivalrebels.com> Co-authored-by: vero <email@atlasdostal.com> Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
262 lines
8.1 KiB
Rust
262 lines
8.1 KiB
Rust
use crate::id;
|
|
use std::ops::Range;
|
|
#[cfg(feature = "trace")]
|
|
use std::{borrow::Cow, io::Write as _};
|
|
|
|
//TODO: consider a readable Id that doesn't include the backend
|
|
|
|
type FileName = String;
|
|
|
|
pub const FILE_NAME: &str = "trace.ron";
|
|
|
|
#[cfg(feature = "trace")]
|
|
pub(crate) fn new_render_bundle_encoder_descriptor<'a>(
|
|
label: crate::Label<'a>,
|
|
context: &'a super::RenderPassContext,
|
|
depth_read_only: bool,
|
|
stencil_read_only: bool,
|
|
) -> crate::command::RenderBundleEncoderDescriptor<'a> {
|
|
crate::command::RenderBundleEncoderDescriptor {
|
|
label,
|
|
color_formats: Cow::Borrowed(&context.attachments.colors),
|
|
depth_stencil: context.attachments.depth_stencil.map(|format| {
|
|
wgt::RenderBundleDepthStencil {
|
|
format,
|
|
depth_read_only,
|
|
stencil_read_only,
|
|
}
|
|
}),
|
|
sample_count: context.sample_count,
|
|
multiview: context.multiview,
|
|
}
|
|
}
|
|
|
|
#[allow(clippy::large_enum_variant)]
|
|
#[derive(Debug)]
|
|
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
|
|
pub enum Action<'a> {
|
|
Init {
|
|
desc: crate::device::DeviceDescriptor<'a>,
|
|
backend: wgt::Backend,
|
|
},
|
|
ConfigureSurface(
|
|
id::SurfaceId,
|
|
wgt::SurfaceConfiguration<Vec<wgt::TextureFormat>>,
|
|
),
|
|
CreateBuffer(id::BufferId, crate::resource::BufferDescriptor<'a>),
|
|
FreeBuffer(id::BufferId),
|
|
DestroyBuffer(id::BufferId),
|
|
CreateTexture(id::TextureId, crate::resource::TextureDescriptor<'a>),
|
|
FreeTexture(id::TextureId),
|
|
DestroyTexture(id::TextureId),
|
|
CreateTextureView {
|
|
id: id::TextureViewId,
|
|
parent_id: id::TextureId,
|
|
desc: crate::resource::TextureViewDescriptor<'a>,
|
|
},
|
|
DestroyTextureView(id::TextureViewId),
|
|
CreateSampler(id::SamplerId, crate::resource::SamplerDescriptor<'a>),
|
|
DestroySampler(id::SamplerId),
|
|
GetSurfaceTexture {
|
|
id: id::TextureId,
|
|
parent_id: id::SurfaceId,
|
|
},
|
|
Present(id::SurfaceId),
|
|
DiscardSurfaceTexture(id::SurfaceId),
|
|
CreateBindGroupLayout(
|
|
id::BindGroupLayoutId,
|
|
crate::binding_model::BindGroupLayoutDescriptor<'a>,
|
|
),
|
|
DestroyBindGroupLayout(id::BindGroupLayoutId),
|
|
CreatePipelineLayout(
|
|
id::PipelineLayoutId,
|
|
crate::binding_model::PipelineLayoutDescriptor<'a>,
|
|
),
|
|
DestroyPipelineLayout(id::PipelineLayoutId),
|
|
CreateBindGroup(
|
|
id::BindGroupId,
|
|
crate::binding_model::BindGroupDescriptor<'a>,
|
|
),
|
|
DestroyBindGroup(id::BindGroupId),
|
|
CreateShaderModule {
|
|
id: id::ShaderModuleId,
|
|
desc: crate::pipeline::ShaderModuleDescriptor<'a>,
|
|
data: FileName,
|
|
},
|
|
DestroyShaderModule(id::ShaderModuleId),
|
|
CreateComputePipeline {
|
|
id: id::ComputePipelineId,
|
|
desc: crate::pipeline::ComputePipelineDescriptor<'a>,
|
|
#[cfg_attr(feature = "replay", serde(default))]
|
|
implicit_context: Option<super::ImplicitPipelineContext>,
|
|
},
|
|
DestroyComputePipeline(id::ComputePipelineId),
|
|
CreateRenderPipeline {
|
|
id: id::RenderPipelineId,
|
|
desc: crate::pipeline::RenderPipelineDescriptor<'a>,
|
|
#[cfg_attr(feature = "replay", serde(default))]
|
|
implicit_context: Option<super::ImplicitPipelineContext>,
|
|
},
|
|
DestroyRenderPipeline(id::RenderPipelineId),
|
|
CreatePipelineCache {
|
|
id: id::PipelineCacheId,
|
|
desc: crate::pipeline::PipelineCacheDescriptor<'a>,
|
|
},
|
|
DestroyPipelineCache(id::PipelineCacheId),
|
|
CreateRenderBundle {
|
|
id: id::RenderBundleId,
|
|
desc: crate::command::RenderBundleEncoderDescriptor<'a>,
|
|
base: crate::command::BasePass<crate::command::RenderCommand>,
|
|
},
|
|
DestroyRenderBundle(id::RenderBundleId),
|
|
CreateQuerySet {
|
|
id: id::QuerySetId,
|
|
desc: crate::resource::QuerySetDescriptor<'a>,
|
|
},
|
|
DestroyQuerySet(id::QuerySetId),
|
|
WriteBuffer {
|
|
id: id::BufferId,
|
|
data: FileName,
|
|
range: Range<wgt::BufferAddress>,
|
|
queued: bool,
|
|
},
|
|
WriteTexture {
|
|
to: crate::command::ImageCopyTexture,
|
|
data: FileName,
|
|
layout: wgt::ImageDataLayout,
|
|
size: wgt::Extent3d,
|
|
},
|
|
Submit(crate::SubmissionIndex, Vec<Command>),
|
|
CreateBlas {
|
|
id: id::BlasId,
|
|
desc: crate::resource::BlasDescriptor<'a>,
|
|
sizes: wgt::BlasGeometrySizeDescriptors,
|
|
},
|
|
FreeBlas(id::BlasId),
|
|
DestroyBlas(id::BlasId),
|
|
CreateTlas {
|
|
id: id::TlasId,
|
|
desc: crate::resource::TlasDescriptor<'a>,
|
|
},
|
|
FreeTlas(id::TlasId),
|
|
DestroyTlas(id::TlasId),
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
|
|
pub enum Command {
|
|
CopyBufferToBuffer {
|
|
src: id::BufferId,
|
|
src_offset: wgt::BufferAddress,
|
|
dst: id::BufferId,
|
|
dst_offset: wgt::BufferAddress,
|
|
size: wgt::BufferAddress,
|
|
},
|
|
CopyBufferToTexture {
|
|
src: crate::command::ImageCopyBuffer,
|
|
dst: crate::command::ImageCopyTexture,
|
|
size: wgt::Extent3d,
|
|
},
|
|
CopyTextureToBuffer {
|
|
src: crate::command::ImageCopyTexture,
|
|
dst: crate::command::ImageCopyBuffer,
|
|
size: wgt::Extent3d,
|
|
},
|
|
CopyTextureToTexture {
|
|
src: crate::command::ImageCopyTexture,
|
|
dst: crate::command::ImageCopyTexture,
|
|
size: wgt::Extent3d,
|
|
},
|
|
ClearBuffer {
|
|
dst: id::BufferId,
|
|
offset: wgt::BufferAddress,
|
|
size: Option<wgt::BufferAddress>,
|
|
},
|
|
ClearTexture {
|
|
dst: id::TextureId,
|
|
subresource_range: wgt::ImageSubresourceRange,
|
|
},
|
|
WriteTimestamp {
|
|
query_set_id: id::QuerySetId,
|
|
query_index: u32,
|
|
},
|
|
ResolveQuerySet {
|
|
query_set_id: id::QuerySetId,
|
|
start_query: u32,
|
|
query_count: u32,
|
|
destination: id::BufferId,
|
|
destination_offset: wgt::BufferAddress,
|
|
},
|
|
PushDebugGroup(String),
|
|
PopDebugGroup,
|
|
InsertDebugMarker(String),
|
|
RunComputePass {
|
|
base: crate::command::BasePass<crate::command::ComputeCommand>,
|
|
timestamp_writes: Option<crate::command::PassTimestampWrites>,
|
|
},
|
|
RunRenderPass {
|
|
base: crate::command::BasePass<crate::command::RenderCommand>,
|
|
target_colors: Vec<Option<crate::command::RenderPassColorAttachment>>,
|
|
target_depth_stencil: Option<crate::command::RenderPassDepthStencilAttachment>,
|
|
timestamp_writes: Option<crate::command::PassTimestampWrites>,
|
|
occlusion_query_set_id: Option<id::QuerySetId>,
|
|
},
|
|
BuildAccelerationStructuresUnsafeTlas {
|
|
blas: Vec<crate::ray_tracing::TraceBlasBuildEntry>,
|
|
tlas: Vec<crate::ray_tracing::TlasBuildEntry>,
|
|
},
|
|
BuildAccelerationStructures {
|
|
blas: Vec<crate::ray_tracing::TraceBlasBuildEntry>,
|
|
tlas: Vec<crate::ray_tracing::TraceTlasPackage>,
|
|
},
|
|
}
|
|
|
|
#[cfg(feature = "trace")]
|
|
#[derive(Debug)]
|
|
pub struct Trace {
|
|
path: std::path::PathBuf,
|
|
file: std::fs::File,
|
|
config: ron::ser::PrettyConfig,
|
|
binary_id: usize,
|
|
}
|
|
|
|
#[cfg(feature = "trace")]
|
|
impl Trace {
|
|
pub fn new(path: &std::path::Path) -> Result<Self, std::io::Error> {
|
|
log::info!("Tracing into '{:?}'", path);
|
|
let mut file = std::fs::File::create(path.join(FILE_NAME))?;
|
|
file.write_all(b"[\n")?;
|
|
Ok(Self {
|
|
path: path.to_path_buf(),
|
|
file,
|
|
config: ron::ser::PrettyConfig::default(),
|
|
binary_id: 0,
|
|
})
|
|
}
|
|
|
|
pub fn make_binary(&mut self, kind: &str, data: &[u8]) -> String {
|
|
self.binary_id += 1;
|
|
let name = format!("data{}.{}", self.binary_id, kind);
|
|
let _ = std::fs::write(self.path.join(&name), data);
|
|
name
|
|
}
|
|
|
|
pub(crate) fn add(&mut self, action: Action) {
|
|
match ron::ser::to_string_pretty(&action, self.config.clone()) {
|
|
Ok(string) => {
|
|
let _ = writeln!(self.file, "{},", string);
|
|
}
|
|
Err(e) => {
|
|
log::warn!("RON serialization failure: {:?}", e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "trace")]
|
|
impl Drop for Trace {
|
|
fn drop(&mut self) {
|
|
let _ = self.file.write_all(b"]");
|
|
}
|
|
}
|