@@ -18,9 +18,11 @@ use std::sync::Arc;
1818use std:: time:: Duration ;
1919use wgpu:: util:: { BufferInitDescriptor , DeviceExt } ;
2020use wgpu:: {
21- Backend , BindGroup , BindGroupDescriptor , BindGroupLayout , BindGroupLayoutDescriptor , Buffer ,
22- ColorTargetState , CommandBuffer , CommandEncoder , Device , PipelineLayoutDescriptor , Queue ,
23- RenderPass , RenderPipeline , RenderPipelineDescriptor , ShaderModuleDescriptor , ShaderSource ,
21+ Backend , BindGroup , BindGroupDescriptor , BindGroupEntry , BindGroupLayout ,
22+ BindGroupLayoutDescriptor , BindGroupLayoutEntry , BindingType , Buffer , BufferBindingType ,
23+ BufferUsages , ColorTargetState , CommandBuffer , CommandEncoder , Device , FragmentState ,
24+ MultisampleState , PipelineLayoutDescriptor , PrimitiveState , Queue , RenderPass , RenderPipeline ,
25+ RenderPipelineDescriptor , ShaderModuleDescriptor , ShaderSource , ShaderStages , VertexState ,
2426} ;
2527
2628static SHADER : & str = include_str ! ( "shader.wgsl" ) ;
@@ -89,17 +91,17 @@ impl FractalViewerApp {
8991 let uniform_buffer = device. create_buffer_init ( & BufferInitDescriptor {
9092 label : Some ( "fv_uniform_buffer" ) ,
9193 contents : bytemuck:: cast_slice ( & [ Uniforms :: new ( size, & settings) ] ) ,
92- usage : wgpu :: BufferUsages :: UNIFORM | wgpu :: BufferUsages :: COPY_DST ,
94+ usage : BufferUsages :: UNIFORM | BufferUsages :: COPY_DST ,
9395 } ) ;
9496
9597 let uniform_bind_group_layout =
9698 device. create_bind_group_layout ( & BindGroupLayoutDescriptor {
9799 label : Some ( "fv_uniform_bind_group_layout" ) ,
98- entries : & [ wgpu :: BindGroupLayoutEntry {
100+ entries : & [ BindGroupLayoutEntry {
99101 binding : 0 ,
100- visibility : wgpu :: ShaderStages :: VERTEX_FRAGMENT ,
101- ty : wgpu :: BindingType :: Buffer {
102- ty : wgpu :: BufferBindingType :: Uniform ,
102+ visibility : ShaderStages :: VERTEX_FRAGMENT ,
103+ ty : BindingType :: Buffer {
104+ ty : BufferBindingType :: Uniform ,
103105 has_dynamic_offset : false ,
104106 min_binding_size : None ,
105107 } ,
@@ -110,7 +112,7 @@ impl FractalViewerApp {
110112 let uniform_bind_group = device. create_bind_group ( & BindGroupDescriptor {
111113 label : Some ( "fv_uniform_bind_group" ) ,
112114 layout : & uniform_bind_group_layout,
113- entries : & [ wgpu :: BindGroupEntry {
115+ entries : & [ BindGroupEntry {
114116 binding : 0 ,
115117 resource : uniform_buffer. as_entire_binding ( ) ,
116118 } ] ,
@@ -135,19 +137,19 @@ impl FractalViewerApp {
135137 let pipeline = device. create_render_pipeline ( & RenderPipelineDescriptor {
136138 label : Some ( "fv_pipeline" ) ,
137139 layout : Some ( & pipeline_layout) ,
138- vertex : wgpu :: VertexState {
140+ vertex : VertexState {
139141 module : & shader,
140142 entry_point : "vs_main" ,
141143 buffers : & [ ] ,
142144 } ,
143- fragment : Some ( wgpu :: FragmentState {
145+ fragment : Some ( FragmentState {
144146 module : & shader,
145147 entry_point : "fs_main" ,
146148 targets : & [ Some ( wgpu_render_state. target_format . into ( ) ) ] ,
147149 } ) ,
148- primitive : wgpu :: PrimitiveState :: default ( ) ,
150+ primitive : PrimitiveState :: default ( ) ,
149151 depth_stencil : None ,
150- multisample : wgpu :: MultisampleState :: default ( ) ,
152+ multisample : MultisampleState :: default ( ) ,
151153 multiview : None ,
152154 } ) ;
153155
@@ -514,19 +516,19 @@ impl FvRenderer {
514516 . create_render_pipeline ( & RenderPipelineDescriptor {
515517 label : Some ( "fv_pipeline" ) ,
516518 layout : Some ( & pipeline_layout) ,
517- vertex : wgpu :: VertexState {
519+ vertex : VertexState {
518520 module : & shader,
519521 entry_point : "vs_main" ,
520522 buffers : & [ ] ,
521523 } ,
522- fragment : Some ( wgpu :: FragmentState {
524+ fragment : Some ( FragmentState {
523525 module : & shader,
524526 entry_point : "fs_main" ,
525527 targets : & [ Some ( self . target_format . clone ( ) ) ] ,
526528 } ) ,
527- primitive : wgpu :: PrimitiveState :: default ( ) ,
529+ primitive : PrimitiveState :: default ( ) ,
528530 depth_stencil : None ,
529- multisample : wgpu :: MultisampleState :: default ( ) ,
531+ multisample : MultisampleState :: default ( ) ,
530532 multiview : None ,
531533 } ) ;
532534
0 commit comments