From c948c882ab3f02ac9418ce2911b2221490540068 Mon Sep 17 00:00:00 2001 From: chyyran Date: Fri, 13 Jan 2023 03:00:45 -0500 Subject: [PATCH] api: export `Size` from `librashader::runtime` --- librashader-capi/src/runtime/d3d11/filter_chain.rs | 3 +-- librashader-capi/src/runtime/gl/filter_chain.rs | 4 ++-- librashader/src/lib.rs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/librashader-capi/src/runtime/d3d11/filter_chain.rs b/librashader-capi/src/runtime/d3d11/filter_chain.rs index 7dd2ecc..e61f6ff 100644 --- a/librashader-capi/src/runtime/d3d11/filter_chain.rs +++ b/librashader-capi/src/runtime/d3d11/filter_chain.rs @@ -14,8 +14,7 @@ use windows::Win32::Graphics::Direct3D11::{ pub use librashader::runtime::d3d11::options::FilterChainOptions; pub use librashader::runtime::d3d11::options::FrameOptions; -use librashader::runtime::Viewport; -use librashader::Size; +use librashader::runtime::{Size, Viewport}; /// OpenGL parameters for the source image. #[repr(C)] diff --git a/librashader-capi/src/runtime/gl/filter_chain.rs b/librashader-capi/src/runtime/gl/filter_chain.rs index 9f13522..a49594f 100644 --- a/librashader-capi/src/runtime/gl/filter_chain.rs +++ b/librashader-capi/src/runtime/gl/filter_chain.rs @@ -11,8 +11,8 @@ use std::slice; pub use librashader::runtime::gl::options::FilterChainOptions; pub use librashader::runtime::gl::options::FrameOptions; -use librashader::runtime::Viewport; -use librashader::Size; +use librashader::runtime::{Size, Viewport}; + /// A GL function loader that librashader needs to be initialized with. pub type gl_loader_t = unsafe extern "C" fn(*const c_char) -> *const c_void; diff --git a/librashader/src/lib.rs b/librashader/src/lib.rs index 6ab5eb4..772a762 100644 --- a/librashader/src/lib.rs +++ b/librashader/src/lib.rs @@ -92,7 +92,7 @@ pub mod reflect { #[cfg(feature = "runtime")] pub mod runtime { pub use librashader_runtime::parameters::FilterChainParameters; - pub use librashader_common::Viewport; + pub use librashader_common::{Viewport, Size}; #[cfg(feature = "gl")] /// Shader runtime for OpenGL 3.3+. @@ -122,4 +122,4 @@ pub mod runtime { } } -pub use librashader_common::{FilterMode, ImageFormat, Size, WrapMode}; +pub use librashader_common::{FilterMode, ImageFormat, WrapMode};