alex/librashader
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "rt(gl): account for flipped coordinate space when blitting to output"

Browse source 
This reverts commit 623c6776f7.
This commit is contained in:
chyyran 2024-03-05 18:45:18 -05:00 committed by Ronny Chan
parent 31b7a6f33f
commit 66a0ee21e3
6 changed files with 33 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
librashader-runtime-gl/src/filter_chain/filter_impl.rs
View file

@ -10,7 +10,7 @@ use crate::texture::InputTexture;
use crate::util::{gl_get_version, gl_u16_to_version};
use crate::{error, GLImage};
use gl::types::GLuint;
use librashader_common::{FilterMode, Viewport, WrapMode};
use librashader_common::Viewport;
use librashader_presets::{ShaderPassConfig, ShaderPreset, TextureConfig};
use librashader_reflect::back::glsl::GlslVersion;
@ -250,7 +250,7 @@ impl<T: GLInterface> FilterChainImpl<T> {
T::FramebufferInterface::init(&mut back, input.size, input.format)?;
}
back.copy_from::<T::FramebufferInterface>(input, false)?;
back.copy_from::<T::FramebufferInterface>(input)?;
self.history_framebuffers.push_front(back)
}
@ -302,17 +302,12 @@ impl<T: GLInterface> FilterChainImpl<T> {
}
// shader_gl3: 2067
// let original = InputTexture {
// image: *input,
// filter,
// mip_filter: filter,
// wrap_mode,
// };
let mut flipped = T::FramebufferInterface::new(1);
flipped.copy_from::<T::FramebufferInterface>(&input, true)?;
let original = flipped.as_texture(filter, wrap_mode);
let original = InputTexture {
image: *input,
filter,
mip_filter: filter,
wrap_mode,
};
let mut source = original;
@ -368,19 +363,9 @@ impl<T: GLInterface> FilterChainImpl<T> {
}
self.draw_quad.bind_vertices(QuadType::Final);
// try to hint the optimizer
assert_eq!(last.len(), 1);
if let Some(pass) = last.iter_mut().next() {
// Need to flip the output, so we'll render to a backbuffer before blitting back to the viewport.
let mut output = T::FramebufferInterface::new(1);
output.right_size::<T::FramebufferInterface>(
&viewport
.output
.as_texture(FilterMode::Linear, WrapMode::ClampToEdge)
.image,
)?;
source.filter = pass.config.filter;
source.mip_filter = pass.config.filter;
source.wrap_mode = pass.config.wrap_mode;
@ -393,22 +378,11 @@ impl<T: GLInterface> FilterChainImpl<T> {
viewport,
&original,
&source,
RenderTarget::viewport_with_output(&output, viewport),
RenderTarget::viewport(viewport),
);
self.common.output_textures[passes_len - 1] =
output.as_texture(pass.config.filter, pass.config.wrap_mode);
// SAFETY: viewport should be the same size as output texture.
unsafe {
viewport
.output
.copy_from_unchecked::<T::FramebufferInterface>(
&output
.as_texture(pass.config.filter, pass.config.wrap_mode)
.image,
true,
)?;
}
self.common.output_textures[passes_len - 1] = viewport
.output
.as_texture(pass.config.filter, pass.config.wrap_mode);
}
// swap feedback framebuffers with output
@ -418,6 +392,7 @@ impl<T: GLInterface> FilterChainImpl<T> {
);
self.push_history(input)?;
self.draw_quad.unbind_vertices();
Ok(())

30
librashader-runtime-gl/src/gl/framebuffer.rs
View file

@ -67,34 +67,8 @@ impl GLFramebuffer {
)
}
pub(crate) unsafe fn copy_from_unchecked<T: FramebufferInterface>(
&self,
image: &GLImage,
flip_y: bool,
) -> Result<()> {
// SAFETY: checked size above.
unsafe { T::copy_from_unchecked(self, image, flip_y) }
}
pub(crate) fn right_size<T: FramebufferInterface>(&mut self, image: &GLImage) -> Result<()> {
if image.size != self.size || image.format != self.format {
T::init(self, image.size, image.format)?;
}
Ok(())
}
pub(crate) fn copy_from<T: FramebufferInterface>(
&mut self,
image: &GLImage,
flip_y: bool,
) -> Result<()> {
if image.size != self.size || image.format != self.format {
T::init(self, image.size, image.format)?;
}
// SAFETY: checked size above.
unsafe { self.copy_from_unchecked::<T>(image, flip_y) }
pub(crate) fn copy_from<T: FramebufferInterface>(&mut self, image: &GLImage) -> Result<()> {
T::copy_from(self, image)
}
pub(crate) fn as_texture(&self, filter: FilterMode, wrap_mode: WrapMode) -> InputTexture {

10
librashader-runtime-gl/src/gl/gl3/framebuffer.rs
View file

@ -80,8 +80,12 @@ impl FramebufferInterface for Gl3Framebuffer {
}
}
}
fn copy_from(fb: &mut GLFramebuffer, image: &GLImage) -> Result<()> {
// todo: may want to use a shader and draw a quad to be faster.
if image.size != fb.size || image.format != fb.format {
Self::init(fb, image.size, image.format)?;
}
unsafe fn copy_from_unchecked(fb: &GLFramebuffer, image: &GLImage, flip_y: bool) -> Result<()> {
unsafe {
gl::BindFramebuffer(gl::FRAMEBUFFER, fb.fbo);
@ -108,9 +112,9 @@ impl FramebufferInterface for Gl3Framebuffer {
fb.size.width as GLint,
fb.size.height as GLint,
0,
if flip_y { fb.size.height as GLint } else { 0 },
0,
fb.size.width as GLint,
if flip_y { 0 } else { fb.size.height as GLint },
fb.size.height as GLint,
gl::COLOR_BUFFER_BIT,
gl::NEAREST,
);

11
librashader-runtime-gl/src/gl/gl46/framebuffer.rs
View file

@ -77,12 +77,17 @@ impl FramebufferInterface for Gl46Framebuffer {
);
}
}
unsafe fn copy_from_unchecked(fb: &GLFramebuffer, image: &GLImage, flip_y: bool) -> Result<()> {
fn copy_from(fb: &mut GLFramebuffer, image: &GLImage) -> Result<()> {
// todo: confirm this behaviour for unbound image.
if image.handle == 0 {
return Ok(());
}
// todo: may want to use a shader and draw a quad to be faster.
if image.size != fb.size || image.format != fb.format {
Self::init(fb, image.size, image.format)?;
}
unsafe {
// gl::NamedFramebufferDrawBuffer(fb.handle, gl::COLOR_ATTACHMENT1);
gl::NamedFramebufferReadBuffer(image.handle, gl::COLOR_ATTACHMENT0);
@ -96,9 +101,9 @@ impl FramebufferInterface for Gl46Framebuffer {
image.size.width as GLint,
image.size.height as GLint,
0,
if flip_y { fb.size.height as GLint } else { 0 },
0,
fb.size.width as GLint,
if flip_y { 0 } else { fb.size.height as GLint },
fb.size.height as GLint,
gl::COLOR_BUFFER_BIT,
gl::NEAREST,
);

2
librashader-runtime-gl/src/gl/mod.rs
View file

@ -95,7 +95,7 @@ pub(crate) trait FramebufferInterface {
mipmap: bool,
) -> Result<Size<u32>>;
fn clear<const REBIND: bool>(fb: &GLFramebuffer);
unsafe fn copy_from_unchecked(fb: &GLFramebuffer, image: &GLImage, flip_y: bool) -> Result<()>;
fn copy_from(fb: &mut GLFramebuffer, image: &GLImage) -> Result<()>;
fn init(fb: &mut GLFramebuffer, size: Size<u32>, format: impl Into<GLenum>) -> Result<()>;
}

5
librashader-runtime-gl/tests/triangle.rs
View file

@ -9,8 +9,7 @@ fn triangle_gl() {
unsafe {
let mut filter = FilterChainGL::load_from_path(
"../test/shaders_slang/crt/crt-hyllian.slangp",
// "../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp",
"../test/shaders_slang/crt/crt-royale.slangp",
Some(&FilterChainOptionsGL {
glsl_version: 0,
use_dsa: false,
@ -31,7 +30,7 @@ fn triangle_gl46() {
let mut filter = FilterChainGL::load_from_path(
// "../test/slang-shaders/vhs/VHSPro.slangp",
// "../test/slang-shaders/test/history.slangp",
"../test/shaders_slang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp",
"../test/shaders_slang/crt/crt-royale.slangp",
// "../test/shadersslang/bezel/Mega_Bezel/Presets/MBZ__0__SMOOTH-ADV.slangp",
Some(&FilterChainOptionsGL {
glsl_version: 0,