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

rt(gl46): fix invalid framebuffer copies

Browse source
This commit is contained in:
chyyran 2024-03-05 18:49:33 -05:00 • committed by Ronny Chan
parent 66a0ee21e3
commit 89b620a7c1
1 changed files with 11 additions and 9 deletions

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

@ -79,22 +79,24 @@ impl FramebufferInterface for Gl46Framebuffer {
} }
fn copy_from(fb: &mut GLFramebuffer, image: &GLImage) -> Result<()> { fn copy_from(fb: &mut GLFramebuffer, image: &GLImage) -> Result<()> {
// todo: confirm this behaviour for unbound image. // 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 { if image.size != fb.size || image.format != fb.format {
Self::init(fb, image.size, image.format)?; Self::init(fb, image.size, image.format)?;
} }
if image.handle == 0 {
return Ok(());
}
unsafe { unsafe {
// gl::NamedFramebufferDrawBuffer(fb.handle, gl::COLOR_ATTACHMENT1); // gl::NamedFramebufferDrawBuffer(fb.handle, gl::COLOR_ATTACHMENT1);
gl::NamedFramebufferReadBuffer(image.handle, gl::COLOR_ATTACHMENT0); gl::NamedFramebufferReadBuffer(fb.fbo, gl::COLOR_ATTACHMENT0);
gl::NamedFramebufferDrawBuffer(fb.fbo, gl::COLOR_ATTACHMENT0); gl::NamedFramebufferDrawBuffer(fb.fbo, gl::COLOR_ATTACHMENT1);
gl::NamedFramebufferTexture(fb.fbo, gl::COLOR_ATTACHMENT0, image.handle, 0);
gl::NamedFramebufferTexture(fb.fbo, gl::COLOR_ATTACHMENT1, fb.image, 0);
gl::BlitNamedFramebuffer( gl::BlitNamedFramebuffer(
image.handle, fb.fbo,
fb.fbo, fb.fbo,
0, 0,
0, 0,
@ -185,4 +187,4 @@ impl FramebufferInterface for Gl46Framebuffer {
} }
Ok(()) Ok(())
} }
} }