rt(d3d9): remove backtrace from Direct3DError
This commit is contained in:
parent
db3d5d05a6
commit
bc269c270c
|
@ -6,7 +6,13 @@ use librashader_runtime::quad::{QuadType, VertexInput};
|
||||||
|
|
||||||
use windows::Win32::Foundation::FALSE;
|
use windows::Win32::Foundation::FALSE;
|
||||||
|
|
||||||
use windows::Win32::Graphics::Direct3D9::{IDirect3DDevice9, IDirect3DVertexBuffer9, IDirect3DVertexDeclaration9, D3DCMP_ALWAYS, D3DCULL_NONE, D3DDECLMETHOD_DEFAULT, D3DDECLTYPE_FLOAT2, D3DDECLTYPE_FLOAT3, D3DDECLTYPE_UNUSED, D3DDECLUSAGE_TEXCOORD, D3DPOOL_DEFAULT, D3DPT_TRIANGLESTRIP, D3DRS_CLIPPING, D3DRS_CULLMODE, D3DRS_LIGHTING, D3DRS_ZENABLE, D3DRS_ZFUNC, D3DTRANSFORMSTATETYPE, D3DTS_PROJECTION, D3DTS_VIEW, D3DVERTEXELEMENT9, D3DRS_COLORWRITEENABLE};
|
use windows::Win32::Graphics::Direct3D9::{
|
||||||
|
IDirect3DDevice9, IDirect3DVertexBuffer9, IDirect3DVertexDeclaration9, D3DCMP_ALWAYS,
|
||||||
|
D3DCULL_NONE, D3DDECLMETHOD_DEFAULT, D3DDECLTYPE_FLOAT2, D3DDECLTYPE_FLOAT3,
|
||||||
|
D3DDECLTYPE_UNUSED, D3DDECLUSAGE_TEXCOORD, D3DPOOL_DEFAULT, D3DPT_TRIANGLESTRIP,
|
||||||
|
D3DRS_CLIPPING, D3DRS_COLORWRITEENABLE, D3DRS_CULLMODE, D3DRS_LIGHTING, D3DRS_ZENABLE,
|
||||||
|
D3DRS_ZFUNC, D3DTRANSFORMSTATETYPE, D3DTS_PROJECTION, D3DTS_VIEW, D3DVERTEXELEMENT9,
|
||||||
|
};
|
||||||
|
|
||||||
const OFFSCREEN_VBO_DATA: [VertexInput; 4] = [
|
const OFFSCREEN_VBO_DATA: [VertexInput; 4] = [
|
||||||
VertexInput {
|
VertexInput {
|
||||||
|
|
|
@ -4,7 +4,6 @@ use librashader_preprocess::PreprocessError;
|
||||||
use librashader_presets::ParsePresetError;
|
use librashader_presets::ParsePresetError;
|
||||||
use librashader_reflect::error::{ShaderCompileError, ShaderReflectError};
|
use librashader_reflect::error::{ShaderCompileError, ShaderReflectError};
|
||||||
use librashader_runtime::image::ImageError;
|
use librashader_runtime::image::ImageError;
|
||||||
use std::backtrace::Backtrace;
|
|
||||||
use std::string::FromUtf8Error;
|
use std::string::FromUtf8Error;
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
|
@ -14,11 +13,7 @@ pub enum FilterChainError {
|
||||||
#[error("invariant assumption about d3d11 did not hold. report this as an issue.")]
|
#[error("invariant assumption about d3d11 did not hold. report this as an issue.")]
|
||||||
Direct3DOperationError(&'static str),
|
Direct3DOperationError(&'static str),
|
||||||
#[error("direct3d driver error")]
|
#[error("direct3d driver error")]
|
||||||
Direct3DError {
|
Direct3DError(#[from] windows::core::Error),
|
||||||
#[from]
|
|
||||||
error: windows::core::Error,
|
|
||||||
backtrace: Backtrace,
|
|
||||||
},
|
|
||||||
#[error("shader preset parse error")]
|
#[error("shader preset parse error")]
|
||||||
ShaderPresetError(#[from] ParsePresetError),
|
ShaderPresetError(#[from] ParsePresetError),
|
||||||
#[error("shader preprocess error")]
|
#[error("shader preprocess error")]
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#![cfg(target_os = "windows")]
|
#![cfg(target_os = "windows")]
|
||||||
#![feature(type_alias_impl_trait)]
|
#![feature(type_alias_impl_trait)]
|
||||||
#![feature(error_generic_member_access)]
|
|
||||||
mod binding;
|
mod binding;
|
||||||
mod d3dx;
|
mod d3dx;
|
||||||
mod draw_quad;
|
mod draw_quad;
|
||||||
|
|
Loading…
Reference in a new issue