alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 23:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix PixelFormat for x11, egl and win32

Browse source
This commit is contained in:
Pierre Krieger 2015-04-30 16:15:37 +02:00
parent 80c49856b2
commit 36de5a5e5a
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/egl/mod.rs
View file

@ -298,9 +298,9 @@ unsafe fn enumerate_configs(egl: &ffi::egl::Egl, display: ffi::egl::types::EGLDi
result.push((config_id, PixelFormat { result.push((config_id, PixelFormat {
hardware_accelerated: attrib!(egl, display, config_id, ffi::egl::CONFIG_CAVEAT) hardware_accelerated: attrib!(egl, display, config_id, ffi::egl::CONFIG_CAVEAT)
!= ffi::egl::SLOW_CONFIG as i32, != ffi::egl::SLOW_CONFIG as i32,
red_bits: attrib!(egl, display, config_id, ffi::egl::RED_SIZE) as u8, color_bits: attrib!(egl, display, config_id, ffi::egl::RED_SIZE) as u8 +
green_bits: attrib!(egl, display, config_id, ffi::egl::BLUE_SIZE) as u8, attrib!(egl, display, config_id, ffi::egl::BLUE_SIZE) as u8 +
blue_bits: attrib!(egl, display, config_id, ffi::egl::GREEN_SIZE) as u8, attrib!(egl, display, config_id, ffi::egl::GREEN_SIZE) as u8,
alpha_bits: attrib!(egl, display, config_id, ffi::egl::ALPHA_SIZE) as u8, alpha_bits: attrib!(egl, display, config_id, ffi::egl::ALPHA_SIZE) as u8,
depth_bits: attrib!(egl, display, config_id, ffi::egl::DEPTH_SIZE) as u8, depth_bits: attrib!(egl, display, config_id, ffi::egl::DEPTH_SIZE) as u8,
stencil_bits: attrib!(egl, display, config_id, ffi::egl::STENCIL_SIZE) as u8, stencil_bits: attrib!(egl, display, config_id, ffi::egl::STENCIL_SIZE) as u8,

10
src/api/win32/init.rs
View file

@ -438,9 +438,7 @@ unsafe fn enumerate_native_pixel_formats(hdc: &WindowWrapper) -> Vec<(PixelForma
result.push((PixelFormat { result.push((PixelFormat {
hardware_accelerated: (output.dwFlags & winapi::PFD_GENERIC_FORMAT) == 0, hardware_accelerated: (output.dwFlags & winapi::PFD_GENERIC_FORMAT) == 0,
red_bits: output.cRedBits, color_bits: output.cRedBits + output.cGreenBits + output.cBlueBits,
green_bits: output.cGreenBits,
blue_bits: output.cBlueBits,
alpha_bits: output.cAlphaBits, alpha_bits: output.cAlphaBits,
depth_bits: output.cDepthBits, depth_bits: output.cDepthBits,
stencil_bits: output.cStencilBits, stencil_bits: output.cStencilBits,
@ -489,9 +487,9 @@ unsafe fn enumerate_arb_pixel_formats(extra: &gl::wgl_extra::Wgl, hdc: &WindowWr
result.push((PixelFormat { result.push((PixelFormat {
hardware_accelerated: true, hardware_accelerated: true,
red_bits: get_info(index, gl::wgl_extra::RED_BITS_ARB) as u8, color_bits: get_info(index, gl::wgl_extra::RED_BITS_ARB) as u8 +
green_bits: get_info(index, gl::wgl_extra::GREEN_BITS_ARB) as u8, get_info(index, gl::wgl_extra::GREEN_BITS_ARB) as u8 +
blue_bits: get_info(index, gl::wgl_extra::BLUE_BITS_ARB) as u8, get_info(index, gl::wgl_extra::BLUE_BITS_ARB) as u8,
alpha_bits: get_info(index, gl::wgl_extra::ALPHA_BITS_ARB) as u8, alpha_bits: get_info(index, gl::wgl_extra::ALPHA_BITS_ARB) as u8,
depth_bits: get_info(index, gl::wgl_extra::DEPTH_BITS_ARB) as u8, depth_bits: get_info(index, gl::wgl_extra::DEPTH_BITS_ARB) as u8,
stencil_bits: get_info(index, gl::wgl_extra::STENCIL_BITS_ARB) as u8, stencil_bits: get_info(index, gl::wgl_extra::STENCIL_BITS_ARB) as u8,

6
src/api/x11/mod.rs
View file

@ -411,9 +411,9 @@ impl Window {
PixelFormat { PixelFormat {
hardware_accelerated: true, hardware_accelerated: true,
red_bits: get_attrib(ffi::glx::RED_SIZE as libc::c_int) as u8, color_bits: get_attrib(ffi::glx::RED_SIZE as libc::c_int) as u8 +
green_bits: get_attrib(ffi::glx::GREEN_SIZE as libc::c_int) as u8, get_attrib(ffi::glx::GREEN_SIZE as libc::c_int) as u8 +
blue_bits: get_attrib(ffi::glx::BLUE_SIZE as libc::c_int) as u8, get_attrib(ffi::glx::BLUE_SIZE as libc::c_int) as u8,
alpha_bits: get_attrib(ffi::glx::ALPHA_SIZE as libc::c_int) as u8, alpha_bits: get_attrib(ffi::glx::ALPHA_SIZE as libc::c_int) as u8,
depth_bits: get_attrib(ffi::glx::DEPTH_SIZE as libc::c_int) as u8, depth_bits: get_attrib(ffi::glx::DEPTH_SIZE as libc::c_int) as u8,
stencil_bits: get_attrib(ffi::glx::STENCIL_SIZE as libc::c_int) as u8, stencil_bits: get_attrib(ffi::glx::STENCIL_SIZE as libc::c_int) as u8,