liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Bump to wgpu-rs master

This commit is contained in:
Mike Welsh 2020-12-26 22:33:38 -08:00
parent 1b77f0bc20
commit 9e46757f5f
4 changed files with 181 additions and 694 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

849
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
render/wgpu/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
license = "MIT OR Apache-2.0"
[dependencies]
wgpu = { git = "https://github.com/gfx-rs/wgpu-rs", rev = "10726ef4ffaab0af7f321b0992dc86928ade8b8c" }
wgpu = { git = "https://github.com/gfx-rs/wgpu-rs", rev = "c0418b1b8ae22e86fd0e7a7eb486e04dcb0bd6f5" }
image = "0.23.12"
jpeg-decoder = "0.1.20"
log = "0.4"

12
render/wgpu/src/lib.rs
View File

@ -327,7 +327,6 @@ impl<T: RenderTarget> WgpuRenderBackend<T> {
as u32,
..Default::default()
},
shader_validation: false,
},
trace_path,
))?;
@ -958,6 +957,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
store: true,
}),
}),
label: None,
});
// Since RenderPass holds a reference to the CommandEncoder, we cast the lifetime
@ -1033,7 +1033,9 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
frame
.render_pass
.set_vertex_buffer(0, self.quad_vbo.slice(..));
frame.render_pass.set_index_buffer(self.quad_ibo.slice(..));
frame
.render_pass
.set_index_buffer(self.quad_ibo.slice(..), wgpu::IndexFormat::Uint16);
match self.mask_state {
MaskState::NoMask => (),
@ -1136,7 +1138,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
.set_vertex_buffer(0, draw.vertex_buffer.slice(..));
frame
.render_pass
.set_index_buffer(draw.index_buffer.slice(..));
.set_index_buffer(draw.index_buffer.slice(..), wgpu::IndexFormat::Uint16);
match self.mask_state {
MaskState::NoMask => (),
@ -1209,7 +1211,9 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
frame
.render_pass
.set_vertex_buffer(0, self.quad_vbo.slice(..));
frame.render_pass.set_index_buffer(self.quad_ibo.slice(..));
frame
.render_pass
.set_index_buffer(self.quad_ibo.slice(..), wgpu::IndexFormat::Uint16);
match self.mask_state {
MaskState::NoMask => (),

12
render/wgpu/src/pipelines.rs
View File

@ -32,15 +32,15 @@ impl Pipelines {
globals_layout: &wgpu::BindGroupLayout,
) -> Result<Self, Error> {
let color_vs =
device.create_shader_module(wgpu::include_spirv!("../shaders/color.vert.spv"));
device.create_shader_module(&wgpu::include_spirv!("../shaders/color.vert.spv"));
let color_fs =
device.create_shader_module(wgpu::include_spirv!("../shaders/color.frag.spv"));
device.create_shader_module(&wgpu::include_spirv!("../shaders/color.frag.spv"));
let texture_vs =
device.create_shader_module(wgpu::include_spirv!("../shaders/texture.vert.spv"));
device.create_shader_module(&wgpu::include_spirv!("../shaders/texture.vert.spv"));
let gradient_fs =
device.create_shader_module(wgpu::include_spirv!("../shaders/gradient.frag.spv"));
device.create_shader_module(&wgpu::include_spirv!("../shaders/gradient.frag.spv"));
let bitmap_fs =
device.create_shader_module(wgpu::include_spirv!("../shaders/bitmap.frag.spv"));
device.create_shader_module(&wgpu::include_spirv!("../shaders/bitmap.frag.spv"));
let vertex_buffers_description = [wgpu::VertexBufferDescriptor {
stride: std::mem::size_of::<GPUVertex>() as u64,
@ -185,7 +185,7 @@ fn create_pipeline_descriptor<'a>(
sample_mask: !0,
alpha_to_coverage_enabled: false,
vertex_state: wgpu::VertexStateDescriptor {
index_format: wgpu::IndexFormat::Uint16,
index_format: Some(wgpu::IndexFormat::Uint16),
vertex_buffers: vertex_buffers_description,
},
}