@ -11,7 +11,7 @@ pub struct RenderPipelineBuilder<'a> {
depth_bias_slope_scale : f32 , depth_bias_slope_scale : f32 ,
depth_bias_clamp : f32 , depth_bias_clamp : f32 ,
primitive_topology : wgpu ::PrimitiveTopology , primitive_topology : wgpu ::PrimitiveTopology ,
color_states : Vec < wgpu ::Color StateDescriptor > , color_states : Vec < wgpu ::Color Target State> ,
depth_stencil : Option < wgpu ::DepthStencilState > , depth_stencil : Option < wgpu ::DepthStencilState > ,
index_format : wgpu ::IndexFormat , index_format : wgpu ::IndexFormat ,
vertex_buffers : Vec < wgpu ::VertexBufferLayout < ' a > > , vertex_buffers : Vec < wgpu ::VertexBufferLayout < ' a > > ,
@ -31,18 +31,14 @@ impl<'a> RenderPipelineBuilder<'a> {
depth_bias : 0 , depth_bias : 0 ,
depth_bias_slope_scale : 0.0 , depth_bias_slope_scale : 0.0 ,
depth_bias_clamp : 0.0 , depth_bias_clamp : 0.0 ,
primitive : wgpu ::PrimitiveState { primitive_topology : wgpu ::PrimitiveTopology ::TriangleList ,
topology : wgpu ::PrimitiveTopology ::TriangleList ,
strip_index_format : None ,
front_face : wgpu ::FrontFace ::Ccw ,
cull_mode : wgpu ::CullMode ::Back ,
// Setting this to anything other than Fill requires Features::NON_FILL_POLYGON_MODE
polygon_mode : wgpu ::PolygonMode ::Fill ,
} ,
color_states : Vec ::new ( ) , color_states : Vec ::new ( ) ,
depth_stencil : None , depth_stencil : None ,
index_format : wgpu ::IndexFormat ::Uint32 , index_format : wgpu ::IndexFormat ::Uint32 ,
vertex_buffers : Vec ::new ( ) , vertex_buffers : Vec ::new ( ) ,
sample_count : 1 ,
sample_mask : ! 0 ,
alpha_to_coverage_enabled : false ,
} }
} }
@ -97,17 +93,17 @@ impl<'a> RenderPipelineBuilder<'a> {
self self
} }
pub fn color_state ( & mut self , cs : wgpu ::Color StateDescriptor ) -> & mut Self { pub fn color_state ( & mut self , cs : wgpu ::Color Target State) -> & mut Self {
self . color_states . push ( cs ) ; self . color_states . push ( cs ) ;
self self
} }
/// Helper method for [RenderPipelineBuilder::color_state]
/// Helper method for [RenderPipelineBuilder::color_state]
pub fn color_solid ( & mut self , format : wgpu ::TextureFormat ) -> & mut Self { pub fn color_solid ( & mut self , format : wgpu ::TextureFormat ) -> & mut Self {
self . color_state ( wgpu ::Color StateDescriptor { self . color_state ( wgpu ::Color Target State {
format , format ,
alpha_blend : wgpu ::Blend Descriptor ::REPLACE , alpha_blend : wgpu ::Blend State ::REPLACE ,
color_blend : wgpu ::Blend Descriptor ::REPLACE , color_blend : wgpu ::Blend State ::REPLACE ,
write_mask : wgpu ::ColorWrite ::ALL , write_mask : wgpu ::ColorWrite ::ALL ,
} ) } )
} }
@ -129,6 +125,9 @@ impl<'a> RenderPipelineBuilder<'a> {
depth_write_enabled , depth_write_enabled ,
depth_compare , depth_compare ,
stencil : Default ::default ( ) , stencil : Default ::default ( ) ,
// Setting this to true requires Features::DEPTH_CLAMPING
clamp_depth : false ,
bias : wgpu ::DepthBiasState ::default ( ) ,
} ) } )
} }
@ -212,29 +211,33 @@ impl<'a> RenderPipelineBuilder<'a> {
vertex : wgpu ::VertexState { vertex : wgpu ::VertexState {
module : & vs , module : & vs ,
entry_point : "main" , entry_point : "main" ,
buffers : & self . vertex_buffers ,
} , } ,
fragment : Some ( wgpu ::FragmentState { fragment : Some ( wgpu ::FragmentState {
module : & fs , module : & fs ,
entry_point : "main" , entry_point : "main" ,
targets : & self . color_states ,
} ) , } ) ,
rasterization_state : Some ( wgpu ::RasterizationStateDescriptor { primitive : wgpu ::PrimitiveState {
topology : self . primitive_topology ,
front_face : self . front_face , front_face : self . front_face ,
cull_mode : self . cull_mode , cull_mode : self . cull_mode ,
depth_bias : self . depth_bias , strip_index_format : None ,
depth_bias_slope_scale : self . depth_bias_slope_scale , polygon_mode : wgpu ::PolygonMode ::Fill ,
depth_bias_clamp : self . depth_bias_clamp , } ,
clamp_depth : false ,
} ) ,
primitive_topology : self . primitive_topology ,
color_states : & self . color_states ,
depth_stencil : self . depth_stencil . clone ( ) , depth_stencil : self . depth_stencil . clone ( ) ,
vertex_state : wgpu ::VertexStateDescriptor { multisample : wgpu ::MultisampleState {
index_format : self . index_format , count : 1 ,
vertex_buffers : & self . vertex_buffers , mask : ! 0 ,
alpha_to_coverage_enabled : false ,
} , } ,
sample_count : self . sample_count , // vertex_state: wgpu::VertexStateDescriptor {
sample_mask : self . sample_mask , // index_format: self.index_format,
alpha_to_coverage_enabled : self . alpha_to_coverage_enabled , // vertex_buffers: &self.vertex_buffers,
// },
// sample_count: self.sample_count,
// sample_mask: self.sample_mask,
// alpha_to_coverage_enabled: self.alpha_to_coverage_enabled,
} ) ; } ) ;
Ok ( pipeline ) Ok ( pipeline )
} }
@ -244,5 +247,5 @@ fn create_shader_module(
device : & wgpu ::Device , device : & wgpu ::Device ,
spirv : wgpu ::ShaderModuleDescriptor , spirv : wgpu ::ShaderModuleDescriptor ,
) -> wgpu ::ShaderModule { ) -> wgpu ::ShaderModule {
device . create_shader_module ( spirv ) device . create_shader_module ( & spirv )
} }
Ben Hansen
4 years ago