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

wgpu: Moved WgpuRenderBackend into backend.rs

This commit is contained in:
Nathan Adams 2022-09-03 02:18:57 +02:00
parent 70d96654d7
commit c7f420dde5
6 changed files with 1592 additions and 1580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src/main.rs
View File

@ -23,8 +23,8 @@ use ruffle_core::{
config::Letterbox, events::KeyCode, tag_utils::SwfMovie, Player, PlayerBuilder, PlayerEvent,
StageDisplayState, StaticCallstack, ViewportDimensions,
};
use ruffle_render_wgpu::backend::WgpuRenderBackend;
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
use ruffle_render_wgpu::WgpuRenderBackend;
use std::cell::RefCell;
use std::io::Read;
use std::path::{Path, PathBuf};

3
exporter/src/main.rs
View File

@ -5,10 +5,11 @@ use indicatif::{ProgressBar, ProgressStyle};
use rayon::prelude::*;
use ruffle_core::tag_utils::SwfMovie;
use ruffle_core::PlayerBuilder;
use ruffle_render_wgpu::backend::WgpuRenderBackend;
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
use ruffle_render_wgpu::descriptors::Descriptors;
use ruffle_render_wgpu::target::TextureTarget;
use ruffle_render_wgpu::{wgpu, WgpuRenderBackend};
use ruffle_render_wgpu::wgpu;
use std::fs::create_dir_all;
use std::panic::catch_unwind;
use std::path::{Path, PathBuf};

1580
render/wgpu/src/backend.rs Normal file
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

4
tests/tests/regression_tests.rs
View File

@ -18,7 +18,9 @@ use ruffle_core::{Player, PlayerBuilder, PlayerEvent, ViewportDimensions};
use ruffle_input_format::{AutomatedEvent, InputInjector, MouseButton as InputMouseButton};
#[cfg(feature = "imgtests")]
use ruffle_render_wgpu::{target::TextureTarget, wgpu, WgpuRenderBackend};
use ruffle_render_wgpu::backend::WgpuRenderBackend;
#[cfg(feature = "imgtests")]
use ruffle_render_wgpu::{target::TextureTarget, wgpu};
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::path::Path;

4
web/src/lib.rs
View File

@ -1258,7 +1258,7 @@ async fn create_renderer(
.dyn_into()
.map_err(|_| "Expected HtmlCanvasElement")?;
match ruffle_render_wgpu::WgpuRenderBackend::for_canvas(&canvas).await {
match ruffle_render_wgpu::backend::WgpuRenderBackend::for_canvas(&canvas).await {
Ok(renderer) => {
return Ok((builder.with_renderer(renderer), canvas, "WebGPU"));
}
@ -1275,7 +1275,7 @@ async fn create_renderer(
.dyn_into()
.map_err(|_| "Expected HtmlCanvasElement")?;
match ruffle_render_wgpu::WgpuRenderBackend::for_canvas(&canvas).await {
match ruffle_render_wgpu::backend::WgpuRenderBackend::for_canvas(&canvas).await {
Ok(renderer) => {
return Ok((
builder.with_renderer(renderer),