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: Update some dependencies 

* js-sys and wasm-bindgen are now the currently latest releases.
* wgpu is not updated to the current master because it breaks
things up.
This commit is contained in:
relrelb 2020-12-04 20:47:20 +02:00 committed by Mike Welsh
parent 7e35d4a4fc
commit e5ace596ce
12 changed files with 833 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1002
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1
exporter/src/main.rs
View File

@ -382,6 +382,7 @@ fn main() -> Result<(), Box<dyn Error>> {
let (device, queue) = block_on(adapter.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: Default::default(),
limits: wgpu::Limits::default(),
shader_validation: false,

6
render/canvas/Cargo.toml
View File

@ -11,13 +11,13 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
base64 = "0.13.0"
fnv = "1.0.7"
js-sys = "0.3.45"
log = "0.4"
js-sys = "0.3.46"
log = "0.4"
ruffle_web_common = { path = "../../web/common" }
svg = "0.8.0"
percent-encoding = "2.1.0"
png = "0.16.8"
wasm-bindgen = "0.2.65"
wasm-bindgen = "0.2.69"
[dependencies.jpeg-decoder]
version = "0.1.20"

6
render/webgl/Cargo.toml
View File

@ -7,13 +7,13 @@ license = "MIT OR Apache-2.0"
[dependencies]
fnv = "1.0.7"
js-sys = "0.3.45"
log = "0.4"
js-sys = "0.3.46"
log = "0.4"
percent-encoding = "2.1.0"
png = "0.16.8"
ruffle_render_common_tess = { path = "../common_tess" }
ruffle_web_common = { path = "../../web/common" }
wasm-bindgen = "0.2.65"
wasm-bindgen = "0.2.69"
[dependencies.jpeg-decoder]
version = "0.1.20"

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 = "e3eadca8c626beb9a1c25c359b0e20f6fdef00c4"}
wgpu = { git = "https://github.com/gfx-rs/wgpu-rs", rev = "10726ef4ffaab0af7f321b0992dc86928ade8b8c" }
image = "0.23.12"
jpeg-decoder = "0.1.20"
log = "0.4"

5
render/wgpu/src/bitmaps.rs
View File

@ -47,7 +47,10 @@ impl BitmapSamplers {
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::Sampler { comparison: false },
ty: wgpu::BindingType::Sampler {
comparison: false,
filtering: true,
},
count: None,
}],
});

5
render/wgpu/src/globals.rs
View File

@ -28,8 +28,9 @@ impl Globals {
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer {
dynamic: false,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: false,
min_binding_size: None,
},
count: None,

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

@ -196,6 +196,7 @@ impl WgpuRenderBackend<SwapChainTarget> {
let (device, queue) = block_on(adapter.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: Default::default(),
limits: wgpu::Limits::default(),
shader_validation: false,
@ -225,7 +226,7 @@ impl<T: RenderTarget> WgpuRenderBackend<T> {
sample_count: descriptors.msaa_sample_count,
dimension: wgpu::TextureDimension::D2,
format: target.format(),
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
});
let frame_buffer_view = frame_buffer.create_view(&Default::default());
@ -237,7 +238,7 @@ impl<T: RenderTarget> WgpuRenderBackend<T> {
sample_count: descriptors.msaa_sample_count,
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Depth24PlusStencil8,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
});
let depth_texture_view = depth_texture.create_view(&Default::default());
@ -783,7 +784,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
sample_count: self.descriptors.msaa_sample_count,
dimension: wgpu::TextureDimension::D2,
format: self.target.format(),
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
});
self.frame_buffer_view = frame_buffer.create_view(&Default::default());
@ -802,7 +803,7 @@ impl<T: RenderTarget + 'static> RenderBackend for WgpuRenderBackend<T> {
sample_count: self.descriptors.msaa_sample_count,
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Depth24PlusStencil8,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
});
self.depth_texture_view = depth_texture.create_view(&Default::default());

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

@ -59,8 +59,9 @@ impl Pipelines {
wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer {
dynamic: false,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: false,
min_binding_size: None,
},
count: None,
@ -68,8 +69,9 @@ impl Pipelines {
wgpu::BindGroupLayoutEntry {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::UniformBuffer {
dynamic: false,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: false,
min_binding_size: None,
},
count: None,
@ -95,8 +97,9 @@ impl Pipelines {
wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer {
dynamic: false,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: false,
min_binding_size: None,
},
count: None,
@ -104,10 +107,10 @@ impl Pipelines {
wgpu::BindGroupLayoutEntry {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::SampledTexture {
ty: wgpu::BindingType::Texture {
multisampled: false,
component_type: wgpu::TextureComponentType::Float,
dimension: wgpu::TextureViewDimension::D2,
sample_type: wgpu::TextureSampleType::Float { filterable: true },
view_dimension: wgpu::TextureViewDimension::D2,
},
count: None,
},
@ -134,8 +137,9 @@ impl Pipelines {
wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStage::VERTEX,
ty: wgpu::BindingType::UniformBuffer {
dynamic: false,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Uniform,
has_dynamic_offset: false,
min_binding_size: None,
},
count: None,
@ -143,10 +147,10 @@ impl Pipelines {
wgpu::BindGroupLayoutEntry {
binding: 1,
visibility: wgpu::ShaderStage::FRAGMENT,
ty: wgpu::BindingType::StorageBuffer {
dynamic: false,
ty: wgpu::BindingType::Buffer {
ty: wgpu::BufferBindingType::Storage { read_only: true },
has_dynamic_offset: false,
min_binding_size: None,
readonly: true,
},
count: None,
},

6
render/wgpu/src/target.rs
View File

@ -48,7 +48,7 @@ impl RenderTargetFrame for SwapChainTargetFrame {
impl SwapChainTarget {
pub fn new(surface: wgpu::Surface, size: (u32, u32), device: &wgpu::Device) -> Self {
let swap_chain_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8Unorm,
width: size.0,
height: size.1,
@ -137,7 +137,7 @@ impl TextureTarget {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::COPY_SRC,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::COPY_SRC,
});
let buffer_label = create_debug_label!("Render target buffer");
let buffer = device.create_buffer(&wgpu::BufferDescriptor {
@ -196,7 +196,7 @@ impl RenderTarget for TextureTarget {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: self.format,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::COPY_SRC,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::COPY_SRC,
});
let buffer_label = create_debug_label!("Render target buffer");

8
web/Cargo.toml
View File

@ -26,14 +26,14 @@ console_error_panic_hook = { version = "0.1.1", optional = true }
console_log = { version = "0.2", optional = true }
fnv = "1.0.7"
generational-arena = "0.2.8"
js-sys = "0.3.45"
js-sys = "0.3.46"
log = "0.4"
ruffle_render_canvas = { path = "../render/canvas", optional = true }
ruffle_web_common = { path = "common" }
ruffle_render_webgl = { path = "../render/webgl", optional = true }
url = "2.2.0"
wasm-bindgen = "0.2.65"
wasm-bindgen-futures = "0.4.18"
wasm-bindgen = "0.2.69"
wasm-bindgen-futures = "0.4.19"
chrono = { version = "0.4", features = ["wasmbind"] }
[dependencies.ruffle_core]
@ -52,4 +52,4 @@ features = [
"Blob", "BlobPropertyBag", "Storage", "WheelEvent"]
[dev-dependencies]
wasm-bindgen-test = "0.3.18"
wasm-bindgen-test = "0.3.19"

6
web/common/Cargo.toml
View File

@ -6,10 +6,10 @@ edition = "2018"
license = "MIT OR Apache-2.0"
[dependencies]
js-sys = "0.3.41"
js-sys = "0.3.46"
log = "0.4"
wasm-bindgen = "0.2.64"
wasm-bindgen = "0.2.69"
[dependencies.web-sys]
version = "0.3.41"
features = ["Window"]
features = ["Window"]