reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use explicit Uniforms type in image pipeline

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2019-11-24 17:25:54 +01:00
parent 1a6333c7f3
commit 700390bdb2
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wgpu/src/image.rs
View File

@ -8,7 +8,7 @@ pub struct Pipeline {
cache: RefCell<HashMap<String, Memory>>, cache: RefCell<HashMap<String, Memory>>,
pipeline: wgpu::RenderPipeline, pipeline: wgpu::RenderPipeline,
transform: wgpu::Buffer, uniforms: wgpu::Buffer,
vertices: wgpu::Buffer, vertices: wgpu::Buffer,
indices: wgpu::Buffer, indices: wgpu::Buffer,
instances: wgpu::Buffer, instances: wgpu::Buffer,
@ -46,14 +46,16 @@ impl Pipeline {
], ],
}); });
let matrix: [f32; 16] = Transformation::identity().into(); let uniforms = Uniforms {
transform: Transformation::identity().into(),
};
let transform_buffer = device let uniforms_buffer = device
.create_buffer_mapped( .create_buffer_mapped(
16, 1,
wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST, wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
) )
.fill_from_slice(&matrix[..]); .fill_from_slice(&[uniforms]);
let constant_bind_group = let constant_bind_group =
device.create_bind_group(&wgpu::BindGroupDescriptor { device.create_bind_group(&wgpu::BindGroupDescriptor {
@ -62,8 +64,8 @@ impl Pipeline {
wgpu::Binding { wgpu::Binding {
binding: 0, binding: 0,
resource: wgpu::BindingResource::Buffer { resource: wgpu::BindingResource::Buffer {
buffer: &transform_buffer, buffer: &uniforms_buffer,
range: 0..64, range: 0..std::mem::size_of::<Uniforms>() as u64,
}, },
}, },
wgpu::Binding { wgpu::Binding {
@ -186,7 +188,7 @@ impl Pipeline {
cache: RefCell::new(HashMap::new()), cache: RefCell::new(HashMap::new()),
pipeline, pipeline,
transform: transform_buffer, uniforms: uniforms_buffer,
vertices, vertices,
indices, indices,
instances, instances,
@ -224,16 +226,18 @@ impl Pipeline {
bounds: Rectangle<u32>, bounds: Rectangle<u32>,
target: &wgpu::TextureView, target: &wgpu::TextureView,
) { ) {
let transform_buffer = device let uniforms_buffer = device
.create_buffer_mapped(16, wgpu::BufferUsage::COPY_SRC) .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
.fill_from_slice(transformation.as_ref()); .fill_from_slice(&[Uniforms {
transform: transformation.into(),
}]);
encoder.copy_buffer_to_buffer( encoder.copy_buffer_to_buffer(
&transform_buffer, &uniforms_buffer,
0, 0,
&self.transform, &self.uniforms,
0, 0,
16 * 4, std::mem::size_of::<Uniforms>() as u64,
); );
// TODO: Batch draw calls using a texture atlas // TODO: Batch draw calls using a texture atlas
@ -450,3 +454,9 @@ struct Instance {
_position: [f32; 2], _position: [f32; 2],
_scale: [f32; 2], _scale: [f32; 2],
} }
#[repr(C)]
#[derive(Debug, Clone, Copy)]
struct Uniforms {
transform: [f32; 16],
}