wgpu: Remove globals from Frame
This commit is contained in:
parent
14ecc98780
commit
8616c898cc
|
@ -755,7 +755,6 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
|
||||||
let mut frame = Frame::new(
|
let mut frame = Frame::new(
|
||||||
&self.descriptors.onscreen.pipelines,
|
&self.descriptors.onscreen.pipelines,
|
||||||
&self.descriptors,
|
&self.descriptors,
|
||||||
&self.globals,
|
|
||||||
UniformBuffer::new(&mut self.uniform_buffers_storage),
|
UniformBuffer::new(&mut self.uniform_buffers_storage),
|
||||||
&frame_output,
|
&frame_output,
|
||||||
self.quad_vbo.slice(..),
|
self.quad_vbo.slice(..),
|
||||||
|
@ -771,6 +770,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
|
||||||
let copy_encoder = if let Some(copy_srgb_bind_group) = &self.copy_srgb_bind_group {
|
let copy_encoder = if let Some(copy_srgb_bind_group) = &self.copy_srgb_bind_group {
|
||||||
debug_assert!(self.copy_srgb_view.is_some());
|
debug_assert!(self.copy_srgb_view.is_some());
|
||||||
Some(frame.swap_srgb(
|
Some(frame.swap_srgb(
|
||||||
|
&self.globals,
|
||||||
copy_srgb_bind_group,
|
copy_srgb_bind_group,
|
||||||
self.target.width() as f32,
|
self.target.width() as f32,
|
||||||
self.target.height() as f32,
|
self.target.height() as f32,
|
||||||
|
@ -1071,7 +1071,6 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
|
||||||
let mut frame = Frame::new(
|
let mut frame = Frame::new(
|
||||||
&self.descriptors.offscreen.pipelines,
|
&self.descriptors.offscreen.pipelines,
|
||||||
&self.descriptors,
|
&self.descriptors,
|
||||||
&self.globals,
|
|
||||||
UniformBuffer::new(&mut self.uniform_buffers_storage),
|
UniformBuffer::new(&mut self.uniform_buffers_storage),
|
||||||
&frame_output,
|
&frame_output,
|
||||||
self.quad_vbo.slice(..),
|
self.quad_vbo.slice(..),
|
||||||
|
|
|
@ -15,7 +15,6 @@ use swf::{BlendMode, Color};
|
||||||
pub struct Frame<'a, T: RenderTargetFrame> {
|
pub struct Frame<'a, T: RenderTargetFrame> {
|
||||||
pipelines: &'a Pipelines,
|
pipelines: &'a Pipelines,
|
||||||
descriptors: &'a Descriptors,
|
descriptors: &'a Descriptors,
|
||||||
globals: &'a Globals,
|
|
||||||
uniform_buffers: UniformBuffer<'a, Transforms>,
|
uniform_buffers: UniformBuffer<'a, Transforms>,
|
||||||
mask_state: MaskState,
|
mask_state: MaskState,
|
||||||
num_masks: u32,
|
num_masks: u32,
|
||||||
|
@ -35,7 +34,6 @@ impl<'a, T: RenderTargetFrame> Frame<'a, T> {
|
||||||
pub fn new(
|
pub fn new(
|
||||||
pipelines: &'a Pipelines,
|
pipelines: &'a Pipelines,
|
||||||
descriptors: &'a Descriptors,
|
descriptors: &'a Descriptors,
|
||||||
globals: &'a Globals,
|
|
||||||
uniform_buffers: UniformBuffer<'a, Transforms>,
|
uniform_buffers: UniformBuffer<'a, Transforms>,
|
||||||
target: &'a T,
|
target: &'a T,
|
||||||
quad_vertices: wgpu::BufferSlice<'a>,
|
quad_vertices: wgpu::BufferSlice<'a>,
|
||||||
|
@ -48,7 +46,6 @@ impl<'a, T: RenderTargetFrame> Frame<'a, T> {
|
||||||
Self {
|
Self {
|
||||||
pipelines,
|
pipelines,
|
||||||
descriptors,
|
descriptors,
|
||||||
globals,
|
|
||||||
uniform_buffers,
|
uniform_buffers,
|
||||||
mask_state: MaskState::NoMask,
|
mask_state: MaskState::NoMask,
|
||||||
num_masks: 0,
|
num_masks: 0,
|
||||||
|
@ -66,6 +63,7 @@ impl<'a, T: RenderTargetFrame> Frame<'a, T> {
|
||||||
|
|
||||||
pub fn swap_srgb(
|
pub fn swap_srgb(
|
||||||
&mut self,
|
&mut self,
|
||||||
|
globals: &Globals,
|
||||||
copy_srgb_bind_group: &wgpu::BindGroup,
|
copy_srgb_bind_group: &wgpu::BindGroup,
|
||||||
width: f32,
|
width: f32,
|
||||||
height: f32,
|
height: f32,
|
||||||
|
@ -91,7 +89,7 @@ impl<'a, T: RenderTargetFrame> Frame<'a, T> {
|
||||||
});
|
});
|
||||||
|
|
||||||
render_pass.set_pipeline(&self.pipelines.copy_srgb_pipeline);
|
render_pass.set_pipeline(&self.pipelines.copy_srgb_pipeline);
|
||||||
render_pass.set_bind_group(0, self.globals.bind_group(), &[]);
|
render_pass.set_bind_group(0, globals.bind_group(), &[]);
|
||||||
self.uniform_buffers.write_uniforms(
|
self.uniform_buffers.write_uniforms(
|
||||||
&self.descriptors.device,
|
&self.descriptors.device,
|
||||||
&self.descriptors.bind_layouts.transforms,
|
&self.descriptors.bind_layouts.transforms,
|
||||||
|
|
Loading…
Reference in New Issue