aboutsummaryrefslogtreecommitdiffstats
path: root/src/api/egl
diff options
context:
space:
mode:
authorPierre Krieger <pierre.krieger1708@gmail.com>2015-09-20 09:29:22 +0200
committerPierre Krieger <pierre.krieger1708@gmail.com>2015-09-21 12:03:55 +0200
commitc244f8c033f100a6e0f3e0b2b408f6ddc1006d47 (patch)
tree786cb96254b0fe69646700fc4845218c5703ffac /src/api/egl
parentf51ace4c7885fa25c146c24181c4d87f5632de3e (diff)
downloadglutin-c244f8c033f100a6e0f3e0b2b408f6ddc1006d47.tar.gz
glutin-c244f8c033f100a6e0f3e0b2b408f6ddc1006d47.zip
Extract GlAttributes from BuilderAttribs
Diffstat (limited to 'src/api/egl')
-rw-r--r--src/api/egl/mod.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/api/egl/mod.rs b/src/api/egl/mod.rs
index 4cd7a7c..c06c8ef 100644
--- a/src/api/egl/mod.rs
+++ b/src/api/egl/mod.rs
@@ -162,7 +162,7 @@ impl Context {
native_display: NativeDisplay)
-> Result<ContextPrototype<'a>, CreationError>
{
- if builder.sharing.is_some() {
+ if builder.opengl.sharing.is_some() {
unimplemented!()
}
@@ -197,7 +197,7 @@ impl Context {
// binding the right API and choosing the version
let (version, api) = unsafe {
- match builder.gl_version {
+ match builder.opengl.version {
GlRequest::Latest => {
if egl_version >= (1, 4) {
if egl.BindAPI(ffi::egl::OPENGL_API) != 0 {
@@ -394,18 +394,18 @@ impl<'a> ContextPrototype<'a> {
if let Some(version) = self.version {
try!(create_context(&self.egl, self.display, &self.egl_version,
&self.extensions, self.api, version, self.config_id,
- self.builder.gl_debug, self.builder.gl_robustness))
+ self.builder.opengl.debug, self.builder.opengl.robustness))
} else if self.api == Api::OpenGlEs {
if let Ok(ctxt) = create_context(&self.egl, self.display, &self.egl_version,
&self.extensions, self.api, (2, 0), self.config_id,
- self.builder.gl_debug, self.builder.gl_robustness)
+ self.builder.opengl.debug, self.builder.opengl.robustness)
{
ctxt
} else if let Ok(ctxt) = create_context(&self.egl, self.display, &self.egl_version,
&self.extensions, self.api, (1, 0),
- self.config_id, self.builder.gl_debug,
- self.builder.gl_robustness)
+ self.config_id, self.builder.opengl.debug,
+ self.builder.opengl.robustness)
{
ctxt
} else {
@@ -415,19 +415,19 @@ impl<'a> ContextPrototype<'a> {
} else {
if let Ok(ctxt) = create_context(&self.egl, self.display, &self.egl_version,
&self.extensions, self.api, (3, 2), self.config_id,
- self.builder.gl_debug, self.builder.gl_robustness)
+ self.builder.opengl.debug, self.builder.opengl.robustness)
{
ctxt
} else if let Ok(ctxt) = create_context(&self.egl, self.display, &self.egl_version,
&self.extensions, self.api, (3, 1),
- self.config_id, self.builder.gl_debug,
- self.builder.gl_robustness)
+ self.config_id, self.builder.opengl.debug,
+ self.builder.opengl.robustness)
{
ctxt
} else if let Ok(ctxt) = create_context(&self.egl, self.display, &self.egl_version,
&self.extensions, self.api, (1, 0),
- self.config_id, self.builder.gl_debug,
- self.builder.gl_robustness)
+ self.config_id, self.builder.opengl.debug,
+ self.builder.opengl.robustness)
{
ctxt
} else {