migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-30 05:10:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add CreationError::OpenGlVersionNotSupported

Browse Source
This commit is contained in:
Pierre Krieger
2015-07-20 19:38:57 +02:00
parent ba5adfa1e1
commit 43dabf131a
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/egl/mod.rs
View File

@@ -68,7 +68,7 @@ impl Context {
} else if egl.BindAPI(ffi::egl::OPENGL_ES_API) != 0 {
(None, Api::OpenGlEs)
} else {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
} else {
(None, Api::OpenGlEs)
@@ -77,21 +77,21 @@ impl Context {
GlRequest::Specific(Api::OpenGlEs, version) => {
if egl_version >= (1, 2) {
if egl.BindAPI(ffi::egl::OPENGL_ES_API) == 0 {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
}
(Some(version), Api::OpenGlEs)
},
GlRequest::Specific(Api::OpenGl, version) => {
if egl_version < (1, 4) {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
if egl.BindAPI(ffi::egl::OPENGL_API) == 0 {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
(Some(version), Api::OpenGl)
},
GlRequest::Specific(_, _) => return Err(CreationError::NotSupported),
GlRequest::Specific(_, _) => return Err(CreationError::OpenGlVersionNotSupported),
GlRequest::GlThenGles { opengles_version, opengl_version } => {
if egl_version >= (1, 4) {
if egl.BindAPI(ffi::egl::OPENGL_API) != 0 {
@@ -99,7 +99,7 @@ impl Context {
} else if egl.BindAPI(ffi::egl::OPENGL_ES_API) != 0 {
(Some(opengles_version), Api::OpenGlEs)
} else {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
} else {
(Some(opengles_version), Api::OpenGlEs)
@@ -245,7 +245,7 @@ impl<'a> ContextPrototype<'a> {
{
ctxt
} else {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
} else {
@@ -267,7 +267,7 @@ impl<'a> ContextPrototype<'a> {
{
ctxt
} else {
return Err(CreationError::NotSupported);
return Err(CreationError::OpenGlVersionNotSupported);
}
}
};
@@ -504,7 +504,7 @@ unsafe fn create_context(egl: &ffi::egl::Egl, display: ffi::egl::types::EGLDispl
if context.is_null() {
match egl.GetError() as u32 {
ffi::egl::BAD_ATTRIBUTE => return Err(CreationError::NotSupported),
ffi::egl::BAD_ATTRIBUTE => return Err(CreationError::OpenGlVersionNotSupported),
e => panic!("eglCreateContext failed: 0x{:x}", e),
}
}