mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 23:11:01 +01:00
[core] Do not use IDs as default types in ProgrammableStageDescriptor
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
1 parent
9bd70d113f
commit
9a67436a1c
4 files changed
+18
-22
No files matched your search
+5
-5
@@ -620,7 +620,7 @@ impl Player {
|
||||
wgc::pipeline::ResolvedComputePipelineDescriptor {
|
||||
label: desc.label,
|
||||
layout: desc.layout.map(|id| self.resolve_pipeline_layout_id(id)),
|
||||
stage: wgc::pipeline::ResolvedProgrammableStageDescriptor {
|
||||
stage: wgc::pipeline::ProgrammableStageDescriptor {
|
||||
module: self.resolve_shader_module_id(desc.stage.module),
|
||||
entry_point: desc.stage.entry_point,
|
||||
constants: desc.stage.constants,
|
||||
@@ -640,7 +640,7 @@ impl Player {
|
||||
wgc::pipeline::RenderPipelineVertexProcessor::Vertex(vertex_state) => {
|
||||
wgc::pipeline::RenderPipelineVertexProcessor::Vertex(
|
||||
wgc::pipeline::ResolvedVertexState {
|
||||
stage: wgc::pipeline::ResolvedProgrammableStageDescriptor {
|
||||
stage: wgc::pipeline::ProgrammableStageDescriptor {
|
||||
module: self.resolve_shader_module_id(vertex_state.stage.module),
|
||||
entry_point: vertex_state.stage.entry_point,
|
||||
constants: vertex_state.stage.constants,
|
||||
@@ -654,7 +654,7 @@ impl Player {
|
||||
}
|
||||
wgc::pipeline::RenderPipelineVertexProcessor::Mesh(task_state, mesh_state) => {
|
||||
let resolved_task = task_state.map(|task| wgc::pipeline::ResolvedTaskState {
|
||||
stage: wgc::pipeline::ResolvedProgrammableStageDescriptor {
|
||||
stage: wgc::pipeline::ProgrammableStageDescriptor {
|
||||
module: self.resolve_shader_module_id(task.stage.module),
|
||||
entry_point: task.stage.entry_point,
|
||||
constants: task.stage.constants,
|
||||
@@ -664,7 +664,7 @@ impl Player {
|
||||
},
|
||||
});
|
||||
let resolved_mesh = wgc::pipeline::ResolvedMeshState {
|
||||
stage: wgc::pipeline::ResolvedProgrammableStageDescriptor {
|
||||
stage: wgc::pipeline::ProgrammableStageDescriptor {
|
||||
module: self.resolve_shader_module_id(mesh_state.stage.module),
|
||||
entry_point: mesh_state.stage.entry_point,
|
||||
constants: mesh_state.stage.constants,
|
||||
@@ -680,7 +680,7 @@ impl Player {
|
||||
let fragment = desc
|
||||
.fragment
|
||||
.map(|fragment_state| wgc::pipeline::ResolvedFragmentState {
|
||||
stage: wgc::pipeline::ResolvedProgrammableStageDescriptor {
|
||||
stage: wgc::pipeline::ProgrammableStageDescriptor {
|
||||
module: self.resolve_shader_module_id(fragment_state.stage.module),
|
||||
entry_point: fragment_state.stage.entry_point,
|
||||
constants: fragment_state.stage.constants,
|
||||
|
||||
@@ -11,9 +11,10 @@ use crate::{
|
||||
id::{self, AdapterId, DeviceId, QueueId, SurfaceId},
|
||||
instance::{self, Adapter, Surface},
|
||||
pipeline::{
|
||||
self, RenderPipelineVertexProcessor, ResolvedComputePipelineDescriptor,
|
||||
ResolvedFragmentState, ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState,
|
||||
ResolvedProgrammableStageDescriptor, ResolvedTaskState, ResolvedVertexState,
|
||||
self, ProgrammableStageDescriptor, RenderPipelineVertexProcessor,
|
||||
ResolvedComputePipelineDescriptor, ResolvedFragmentState,
|
||||
ResolvedGeneralRenderPipelineDescriptor, ResolvedMeshState, ResolvedTaskState,
|
||||
ResolvedVertexState,
|
||||
},
|
||||
present,
|
||||
resource::{
|
||||
@@ -892,7 +893,7 @@ impl Global {
|
||||
let vertex = match desc.vertex {
|
||||
RenderPipelineVertexProcessor::Vertex(ref vertex) => {
|
||||
let module = hub.shader_modules.get(vertex.stage.module);
|
||||
let stage = ResolvedProgrammableStageDescriptor {
|
||||
let stage = ProgrammableStageDescriptor {
|
||||
module,
|
||||
entry_point: vertex.stage.entry_point.clone(),
|
||||
constants: vertex.stage.constants.clone(),
|
||||
@@ -907,7 +908,7 @@ impl Global {
|
||||
let task_module = if let Some(task) = task {
|
||||
let module = hub.shader_modules.get(task.stage.module);
|
||||
|
||||
let state = ResolvedProgrammableStageDescriptor {
|
||||
let state = ProgrammableStageDescriptor {
|
||||
module,
|
||||
entry_point: task.stage.entry_point.clone(),
|
||||
constants: task.stage.constants.clone(),
|
||||
@@ -920,7 +921,7 @@ impl Global {
|
||||
None
|
||||
};
|
||||
let mesh_module = hub.shader_modules.get(mesh.stage.module);
|
||||
let mesh_stage = ResolvedProgrammableStageDescriptor {
|
||||
let mesh_stage = ProgrammableStageDescriptor {
|
||||
module: mesh_module,
|
||||
entry_point: mesh.stage.entry_point.clone(),
|
||||
constants: mesh.stage.constants.clone(),
|
||||
@@ -936,7 +937,7 @@ impl Global {
|
||||
let fragment = if let Some(ref state) = desc.fragment {
|
||||
let module = hub.shader_modules.get(state.stage.module);
|
||||
|
||||
let stage = ResolvedProgrammableStageDescriptor {
|
||||
let stage = ProgrammableStageDescriptor {
|
||||
module,
|
||||
entry_point: state.stage.entry_point.clone(),
|
||||
constants: state.stage.constants.clone(),
|
||||
@@ -1020,7 +1021,7 @@ impl Global {
|
||||
|
||||
let module = hub.shader_modules.get(desc.stage.module);
|
||||
|
||||
let stage = ResolvedProgrammableStageDescriptor {
|
||||
let stage = ProgrammableStageDescriptor {
|
||||
module,
|
||||
entry_point: desc.stage.entry_point.clone(),
|
||||
constants: desc.stage.constants.clone(),
|
||||
|
||||
@@ -676,9 +676,7 @@ impl<'a> IntoTrace for &'_ crate::binding_model::BindGroupDescriptor<'a> {
|
||||
type Output = TraceBindGroupDescriptor<'a>;
|
||||
|
||||
fn into_trace(self) -> Self::Output {
|
||||
use crate::binding_model::{
|
||||
BindGroupEntry, BindingResource, BufferBinding,
|
||||
};
|
||||
use crate::binding_model::{BindGroupEntry, BindingResource, BufferBinding};
|
||||
TraceBindGroupDescriptor {
|
||||
label: self.label.clone(),
|
||||
layout: self.layout.to_trace(),
|
||||
@@ -775,7 +773,7 @@ impl<'a> IntoTrace for crate::pipeline::ResolvedComputePipelineDescriptor<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> IntoTrace for crate::pipeline::ResolvedProgrammableStageDescriptor<'a> {
|
||||
impl<'a> IntoTrace for crate::pipeline::ProgrammableStageDescriptor<'a> {
|
||||
type Output =
|
||||
crate::pipeline::ProgrammableStageDescriptor<'a, PointerId<markers::ShaderModule>>;
|
||||
fn into_trace(self) -> Self::Output {
|
||||
|
||||
@@ -239,7 +239,8 @@ impl WebGpuError for CreateShaderModuleError {
|
||||
/// Describes a programmable pipeline stage.
|
||||
#[derive(Clone, Debug)]
|
||||
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
|
||||
pub struct ProgrammableStageDescriptor<'a, SM = ShaderModuleId> {
|
||||
/// cbindgen:ignore
|
||||
pub struct ProgrammableStageDescriptor<'a, SM = Arc<ShaderModule>> {
|
||||
/// The compiled shader module for this stage.
|
||||
pub module: SM,
|
||||
|
||||
@@ -271,10 +272,6 @@ pub struct ProgrammableStageDescriptor<'a, SM = ShaderModuleId> {
|
||||
pub zero_initialize_workgroup_memory: bool,
|
||||
}
|
||||
|
||||
/// cbindgen:ignore
|
||||
pub type ResolvedProgrammableStageDescriptor<'a> =
|
||||
ProgrammableStageDescriptor<'a, Arc<ShaderModule>>;
|
||||
|
||||
/// Number of implicit bind groups derived at pipeline creation.
|
||||
pub type ImplicitBindGroupCount = u8;
|
||||
|
||||
|
||||
Reference in new issue
Block a user