src/video/SDL_egl.c
changeset 8966 5771ab3290d6
parent 8964 d9ac759bb62a
child 8971 c30e826412d1
--- a/src/video/SDL_egl.c	Sat Jun 28 12:50:17 2014 -0300
+++ b/src/video/SDL_egl.c	Sat Jun 28 13:05:16 2014 -0300
@@ -416,9 +416,7 @@
     }
     
     /* Bind the API */
-#if !__ANDROID__ /* No support for desktop OpenGL on Android */
     if(_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
-#endif /* !__ANDROID__ */        
         _this->egl_data->eglBindAPI(EGL_OPENGL_ES_API);
         if (_this->gl_config.major_version) {
             context_attrib_list[1] = _this->gl_config.major_version;
@@ -427,11 +425,10 @@
         egl_context = _this->egl_data->eglCreateContext(_this->egl_data->egl_display,
                                           _this->egl_data->egl_config,
                                           share_context, context_attrib_list);
-
-#if !__ANDROID__
     }
     else {
         _this->egl_data->eglBindAPI(EGL_OPENGL_API);
+#ifdef EGL_KHR_create_context        
         if(SDL_EGL_HasExtension(_this, "EGL_KHR_create_context")) {
             context_attrib_list[0] = EGL_CONTEXT_MAJOR_VERSION_KHR;
             context_attrib_list[1] = _this->gl_config.major_version;
@@ -452,11 +449,13 @@
         else {
             context_attrib_list[0] = EGL_NONE;
         }
+#else /* EGL_KHR_create_context*/
+        context_attrib_list[0] = EGL_NONE;
+#endif /* EGL_KHR_create_context */
         egl_context = _this->egl_data->eglCreateContext(_this->egl_data->egl_display,
                                           _this->egl_data->egl_config,
                                           share_context, context_attrib_list);
     }
-#endif /* !__ANDROID__ */
     
     if (egl_context == EGL_NO_CONTEXT) {
         SDL_SetError("Could not create EGL context");