alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #344 from tomaka/gles-win32

Browse source 
Add support for GLES on Win32
This commit is contained in:
tomaka 2015-04-02 13:22:59 +02:00
parent a1ce4b6616 eabfa9e624
commit aa97fac6ff
2 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.rs
View file

@ -26,9 +26,13 @@ fn main() {
khronos_api::WGL_XML, khronos_api::WGL_XML,
vec![ vec![
"WGL_ARB_create_context".to_string(), "WGL_ARB_create_context".to_string(),
"WGL_EXT_swap_control".to_string(), "WGL_ARB_create_context_profile".to_string(),
"WGL_ARB_pixel_format".to_string(), "WGL_ARB_extensions_string".to_string(),
"WGL_ARB_framebuffer_sRGB".to_string(), "WGL_ARB_framebuffer_sRGB".to_string(),
"WGL_ARB_pixel_format".to_string(),
"WGL_EXT_create_context_es2_profile".to_string(),
"WGL_EXT_extensions_string".to_string(),
"WGL_EXT_swap_control".to_string(),
], ],
"1.0", "core", &mut file).unwrap(); "1.0", "core", &mut file).unwrap();
} }

39
src/win32/init.rs
View file

@ -23,7 +23,7 @@ use CursorState;
use GlRequest; use GlRequest;
use PixelFormat; use PixelFormat;
use std::ffi::CString; use std::ffi::{CStr, CString};
use std::sync::mpsc::channel; use std::sync::mpsc::channel;
use libc; use libc;
@ -344,7 +344,22 @@ unsafe fn create_context(extra: Option<(&gl::wgl_extra::Wgl, &BuilderAttribs<'st
attributes.push(gl::wgl_extra::CONTEXT_MINOR_VERSION_ARB as libc::c_int); attributes.push(gl::wgl_extra::CONTEXT_MINOR_VERSION_ARB as libc::c_int);
attributes.push(minor as libc::c_int); attributes.push(minor as libc::c_int);
}, },
GlRequest::Specific(_, _) => panic!("Only OpenGL is supported"), GlRequest::Specific(Api::OpenGlEs, (major, minor)) => {
if is_extension_supported(extra_functions, hdc,
"WGL_EXT_create_context_es2_profile")
{
attributes.push(gl::wgl_extra::CONTEXT_PROFILE_MASK_ARB as libc::c_int);
attributes.push(gl::wgl_extra::CONTEXT_ES2_PROFILE_BIT_EXT as libc::c_int);
} else {
return Err(CreationError::NotSupported);
}
attributes.push(gl::wgl_extra::CONTEXT_MAJOR_VERSION_ARB as libc::c_int);
attributes.push(major as libc::c_int);
attributes.push(gl::wgl_extra::CONTEXT_MINOR_VERSION_ARB as libc::c_int);
attributes.push(minor as libc::c_int);
},
GlRequest::Specific(_, _) => return Err(CreationError::NotSupported),
GlRequest::GlThenGles { opengl_version: (major, minor), .. } => { GlRequest::GlThenGles { opengl_version: (major, minor), .. } => {
attributes.push(gl::wgl_extra::CONTEXT_MAJOR_VERSION_ARB as libc::c_int); attributes.push(gl::wgl_extra::CONTEXT_MAJOR_VERSION_ARB as libc::c_int);
attributes.push(major as libc::c_int); attributes.push(major as libc::c_int);
@ -515,3 +530,23 @@ unsafe fn load_opengl32_dll() -> Result<winapi::HMODULE, CreationError> {
Ok(lib) Ok(lib)
} }
unsafe fn is_extension_supported(extra: &gl::wgl_extra::Wgl, hdc: &WindowWrapper,
extension: &str) -> bool
{
let extensions = if extra.GetExtensionsStringARB.is_loaded() {
let data = extra.GetExtensionsStringARB(hdc.1 as *const _);
let data = CStr::from_ptr(data).to_bytes().to_vec();
String::from_utf8(data).unwrap()
} else if extra.GetExtensionsStringEXT.is_loaded() {
let data = extra.GetExtensionsStringEXT();
let data = CStr::from_ptr(data).to_bytes().to_vec();
String::from_utf8(data).unwrap()
} else {
return false;
};
extensions.split(" ").find(|&e| e == extension).is_some()
}