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 support for WGL and EGL #1382

Closed
wants to merge 2 commits into from
Closed

Fix sRGB support for WGL and EGL #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ea598
Implement sRGB support for EGL
derezzedex Oct 26, 2021
ba680ea
Implement sRGB support for WGL
derezzedex Oct 26, 2021
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
18 changes: 14 additions & 4 deletions glutin/src/api/egl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,8 +816,20 @@ impl<'a> ContextPrototype<'a> {
pub fn finish(self, nwin: ffi::EGLNativeWindowType) -> Result<Context, CreationError> {
let egl = EGL.as_ref().unwrap();
let surface = unsafe {
let colorspace = if self.pixel_format.srgb {
ffi::egl::GL_COLORSPACE_SRGB
} else {
ffi::egl::GL_COLORSPACE_LINEAR
};

let attrs = &[
ffi::egl::GL_COLORSPACE as raw::c_int,
colorspace as raw::c_int,
ffi::egl::NONE as raw::c_int,
];

let surface =
egl.CreateWindowSurface(self.display, self.config_id, nwin, std::ptr::null());
egl.CreateWindowSurface(self.display, self.config_id, nwin, attrs.as_ptr());
if surface.is_null() {
return Err(CreationError::OsError("eglCreateWindowSurface failed".to_string()));
}
Expand Down Expand Up @@ -1126,8 +1138,6 @@ where
out.push(xid as raw::c_int);
}

// FIXME: srgb is not taken into account

match pf_reqs.release_behavior {
ReleaseBehavior::Flush => (),
ReleaseBehavior::None => {
Expand Down Expand Up @@ -1238,7 +1248,7 @@ where
0 | 1 => None,
a => Some(a as u16),
},
srgb: false, // TODO: use EGL_KHR_gl_colorspace to know that
srgb: pf_reqs.srgb,
};

Ok((config_id, desc))
Expand Down
11 changes: 10 additions & 1 deletion glutin/src/api/wgl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,14 @@ unsafe fn choose_arb_pixel_format_id(

// WGL_*_FRAMEBUFFER_SRGB might be assumed to be true if not listed;
// so it's best to list it out and set its value as necessary.
if extensions.split(' ').find(|&i| i == "WGL_ARB_framebuffer_sRGB").is_some() {
if extensions.split(' ').find(|&i| i == "WGL_EXT_colorspace").is_some() {
out.push(gl::wgl_extra::COLORSPACE_EXT as raw::c_int);
if pf_reqs.srgb {
out.push(gl::wgl_extra::COLORSPACE_SRGB_EXT as raw::c_int);
} else {
out.push(gl::wgl_extra::COLORSPACE_LINEAR_EXT as raw::c_int);
}
} else if extensions.split(' ').find(|&i| i == "WGL_ARB_framebuffer_sRGB").is_some() {
out.push(gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_ARB as raw::c_int);
out.push(pf_reqs.srgb as raw::c_int);
} else if extensions.split(' ').find(|&i| i == "WGL_EXT_framebuffer_sRGB").is_some() {
Expand Down Expand Up @@ -705,6 +712,8 @@ unsafe fn choose_arb_pixel_format(
get_info(gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_ARB) != 0
} else if extensions.split(' ').find(|&i| i == "WGL_EXT_framebuffer_sRGB").is_some() {
get_info(gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_EXT) != 0
} else if extensions.split(' ').find(|&i| i == "WGL_EXT_colorspace").is_some() {
get_info(gl::wgl_extra::FRAMEBUFFER_SRGB_CAPABLE_EXT) != 0
} else {
false
},
Expand Down
1 change: 1 addition & 0 deletions glutin_egl_sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ fn main() {
"EGL_EXT_platform_wayland",
"EGL_EXT_platform_device",
"EGL_KHR_swap_buffers_with_damage",
"EGL_KHR_gl_colorspace",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What will happen with new EGL path when this extension isn't supported?

],
);

Expand Down
1 change: 1 addition & 0 deletions glutin_wgl_sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ fn main() {
"WGL_EXT_extensions_string",
"WGL_EXT_framebuffer_sRGB",
"WGL_EXT_swap_control",
"WGL_EXT_colorspace",
],
)
.write_bindings(gl_generator::StructGenerator, &mut file)
Expand Down