wgpu: Moved WgpuRenderBackend into backend.rs
This commit is contained in:
parent
70d96654d7
commit
c7f420dde5
|
@ -23,8 +23,8 @@ use ruffle_core::{
|
||||||
config::Letterbox, events::KeyCode, tag_utils::SwfMovie, Player, PlayerBuilder, PlayerEvent,
|
config::Letterbox, events::KeyCode, tag_utils::SwfMovie, Player, PlayerBuilder, PlayerEvent,
|
||||||
StageDisplayState, StaticCallstack, ViewportDimensions,
|
StageDisplayState, StaticCallstack, ViewportDimensions,
|
||||||
};
|
};
|
||||||
|
use ruffle_render_wgpu::backend::WgpuRenderBackend;
|
||||||
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
|
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
|
||||||
use ruffle_render_wgpu::WgpuRenderBackend;
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
|
@ -5,10 +5,11 @@ use indicatif::{ProgressBar, ProgressStyle};
|
||||||
use rayon::prelude::*;
|
use rayon::prelude::*;
|
||||||
use ruffle_core::tag_utils::SwfMovie;
|
use ruffle_core::tag_utils::SwfMovie;
|
||||||
use ruffle_core::PlayerBuilder;
|
use ruffle_core::PlayerBuilder;
|
||||||
|
use ruffle_render_wgpu::backend::WgpuRenderBackend;
|
||||||
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
|
use ruffle_render_wgpu::clap::{GraphicsBackend, PowerPreference};
|
||||||
use ruffle_render_wgpu::descriptors::Descriptors;
|
use ruffle_render_wgpu::descriptors::Descriptors;
|
||||||
use ruffle_render_wgpu::target::TextureTarget;
|
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::fs::create_dir_all;
|
||||||
use std::panic::catch_unwind;
|
use std::panic::catch_unwind;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -18,7 +18,9 @@ use ruffle_core::{Player, PlayerBuilder, PlayerEvent, ViewportDimensions};
|
||||||
use ruffle_input_format::{AutomatedEvent, InputInjector, MouseButton as InputMouseButton};
|
use ruffle_input_format::{AutomatedEvent, InputInjector, MouseButton as InputMouseButton};
|
||||||
|
|
||||||
#[cfg(feature = "imgtests")]
|
#[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::cell::RefCell;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
|
@ -1258,7 +1258,7 @@ async fn create_renderer(
|
||||||
.dyn_into()
|
.dyn_into()
|
||||||
.map_err(|_| "Expected HtmlCanvasElement")?;
|
.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) => {
|
Ok(renderer) => {
|
||||||
return Ok((builder.with_renderer(renderer), canvas, "WebGPU"));
|
return Ok((builder.with_renderer(renderer), canvas, "WebGPU"));
|
||||||
}
|
}
|
||||||
|
@ -1275,7 +1275,7 @@ async fn create_renderer(
|
||||||
.dyn_into()
|
.dyn_into()
|
||||||
.map_err(|_| "Expected HtmlCanvasElement")?;
|
.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) => {
|
Ok(renderer) => {
|
||||||
return Ok((
|
return Ok((
|
||||||
builder.with_renderer(renderer),
|
builder.with_renderer(renderer),
|
||||||
|
|
Loading…
Reference in New Issue