Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sRGB issues with glBlitFramebuffer on WGL #4273

Merged
merged 3 commits into from
Oct 20, 2023
Merged

Fix sRGB issues with glBlitFramebuffer on WGL #4273

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
062b4bb
Use the device OpenGL context for WGL surfaces
Zoxc Oct 18, 2023
8bff1d6
Fix sRGB issues with glBlitFramebuffer on WGL
Zoxc Oct 20, 2023
82f35ef
Merge branch 'trunk' into wgl-srgb
cwfitzgerald Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions wgpu-hal/src/gles/wgl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,12 @@ impl Surface {
unsafe { gl.bind_framebuffer(glow::DRAW_FRAMEBUFFER, None) };
unsafe { gl.bind_framebuffer(glow::READ_FRAMEBUFFER, Some(sc.framebuffer)) };

if self.srgb_capable {
// Disable sRGB conversions for `glBlitFramebuffer` as behavior does diverge between
// drivers and formats otherwise and we want to ensure no sRGB conversions happen.
unsafe { gl.disable(glow::FRAMEBUFFER_SRGB) };
}

// Note the Y-flipping here. GL's presentation is not flipped,
// but main rendering is. Therefore, we Y-flip the output positions
// in the shader, and also this blit.
Expand All @@ -550,6 +556,10 @@ impl Surface {
)
};

if self.srgb_capable {
unsafe { gl.enable(glow::FRAMEBUFFER_SRGB) };
}

unsafe { gl.bind_renderbuffer(glow::RENDERBUFFER, None) };
unsafe { gl.bind_framebuffer(glow::READ_FRAMEBUFFER, None) };

Expand Down