X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fegl%2Ffg_window_egl.c;h=62980321956d0af5c27fbe8082a759394313aa30;hb=67f242b7dd68bea7dea467f9b5265c8448b6655e;hp=48e330ca3fdceb06c336dd0d10d8319f2acdb53f;hpb=e03ed4c92640c0252e4bf50dbbfea07bcb75989a;p=freeglut

diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c
index 48e330c..6298032 100644
--- a/src/egl/fg_window_egl.c
+++ b/src/egl/fg_window_egl.c
@@ -1,9 +1,9 @@
 /*
- * freeglut_display_android.c
+ * fg_display_android.c
  *
  * Window management methods for EGL
  *
- * Copyright (C) 2012  Sylvain Beucler
+ * Copyright (C) 2012, 2014  Sylvain Beucler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -26,31 +26,52 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-int fghChooseConfigEGL(EGLConfig* config) {
-  const EGLint attribs[] = {
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-#ifdef GL_ES_VERSION_2_0
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
+int fghChooseConfig(EGLConfig* config) {
+  EGLint attributes[32];
+  int where = 0;
+  ATTRIB_VAL(EGL_SURFACE_TYPE, EGL_WINDOW_BIT);
+#ifdef EGL_OPENGL_ES3_BIT
+  if (fgDisplay.pDisplay.egl.MinorVersion >= 5 && fgState.MajorVersion >= 3) {
+    ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT);
+  } else
+#endif
+  if (fgState.MajorVersion >= 2) {
+    /*
+     * Khronos does not specify a EGL_OPENGL_ES3_BIT outside of the OpenGL extension "EGL_KHR_create_context" and EGL 1.5. There are numerous references on the internet 
+     * that say to use EGL_OPENGL_ES3_BIT (pre-EGL 1.5), followed by many saying they can't find it in any headers. In fact, the offical updated specification for EGL 
+     * does not have any references to OpenGL ES 3.x. Tests have shown that EGL_OPENGL_ES2_BIT will work with ES 3.x.
+     */
+    ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT);
+  } else {
+    ATTRIB_VAL(EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT);
+  }
+  /* Technically it's possible to request a standard OpenGL (non-ES)
+     context, but currently our build system assumes EGL => GLES */
+  /* attribs[i++] = EGL_RENDERABLE_TYPE; */
+  /* attribs[i++] = EGL_OPENGL_BIT; */
+#ifdef TARGET_HOST_BLACKBERRY
+  /* Only 888 and 565 seem to work. Based on
+       http://qt.gitorious.org/qt/qtbase/source/893deb1a93021cdfabe038cdf1869de33a60cbc9:src/plugins/platforms/qnx/qqnxglcontext.cpp and
+       https://twitter.com/BlackBerryDev/status/380720927475912706 */
+  ATTRIB_VAL(EGL_BLUE_SIZE, 8);
+  ATTRIB_VAL(EGL_GREEN_SIZE, 8);
+  ATTRIB_VAL(EGL_RED_SIZE, 8);
 #else
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+  ATTRIB_VAL(EGL_BLUE_SIZE, 1);
+  ATTRIB_VAL(EGL_GREEN_SIZE, 1);
+  ATTRIB_VAL(EGL_RED_SIZE, 1);
 #endif
-    EGL_BLUE_SIZE, 1,
-    EGL_GREEN_SIZE, 1,
-    EGL_RED_SIZE, 1,
-    EGL_ALPHA_SIZE, (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0,
-    EGL_DEPTH_SIZE, (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0,
-    EGL_STENCIL_SIZE, (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0,
-    EGL_SAMPLE_BUFFERS, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? 1 : 0,
-    EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0,
-    EGL_NONE
-  };
-  
+  ATTRIB_VAL(EGL_ALPHA_SIZE, (fgState.DisplayMode & GLUT_ALPHA) ? 1 : 0);
+  ATTRIB_VAL(EGL_DEPTH_SIZE, (fgState.DisplayMode & GLUT_DEPTH) ? 1 : 0);
+  ATTRIB_VAL(EGL_STENCIL_SIZE, (fgState.DisplayMode & GLUT_STENCIL) ? 1 : 0);
+  ATTRIB_VAL(EGL_SAMPLE_BUFFERS, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? 1 : 0);
+  ATTRIB_VAL(EGL_SAMPLES, (fgState.DisplayMode & GLUT_MULTISAMPLE) ? fgState.SampleNumber : 0);
+  ATTRIB(EGL_NONE);
+
   EGLint num_config;
   if (!eglChooseConfig(fgDisplay.pDisplay.egl.Display,
-		       attribs, config, 1, &num_config)) {
-    fgWarn("eglChooseConfig: error %x\n", eglGetError());
+               attributes, config, 1, &num_config)) {
+    fgWarning("eglChooseConfig: error %x\n", eglGetError());
     return 0;
   }
 
@@ -62,32 +83,56 @@ int fghChooseConfigEGL(EGLConfig* config) {
  */
 EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   EGLContext context;
+  EGLint ver = -1;
 
   EGLDisplay eglDisplay = fgDisplay.pDisplay.egl.Display;
   EGLConfig eglConfig = window->Window.pContext.egl.Config;
 
-  /* Ensure OpenGLES 2.0 context */
-  static const EGLint ctx_attribs[] = {
-#ifdef GL_ES_VERSION_2_0
-    EGL_CONTEXT_CLIENT_VERSION, 2,
-#elif GL_VERSION_ES_CM_1_0 || GL_VERSION_ES_CL_1_0 || GL_VERSION_ES_CM_1_1 || GL_VERSION_ES_CL_1_1
-    EGL_CONTEXT_CLIENT_VERSION, 1,
+  /* On GLES, user specifies the target version with glutInitContextVersion */
+  EGLint attributes[32];
+  int where = 0;
+  ATTRIB_VAL(EGL_CONTEXT_CLIENT_VERSION, fgState.MajorVersion);
+#ifdef EGL_CONTEXT_MINOR_VERSION
+  if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
+    // EGL_CONTEXT_CLIENT_VERSION == EGL_CONTEXT_MAJOR_VERSION
+    ATTRIB_VAL(EGL_CONTEXT_MINOR_VERSION, fgState.MinorVersion);
+  }
 #endif
-    EGL_NONE
-  };
-  context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs);
+  ATTRIB(EGL_NONE);
+
+  context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, attributes);
   if (context == EGL_NO_CONTEXT) {
     fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError());
     fghContextCreationError();
   }
-  EGLint ver = -1;
+
   eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
-  if (ver != 2)
+  if (ver != fgState.MajorVersion) {
     fgError("Wrong GLES major version: %d\n", ver);
+  }
+#ifdef EGL_CONTEXT_MINOR_VERSION
+  if (fgDisplay.pDisplay.egl.MinorVersion >= 5) {
+    eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_MINOR_VERSION, &ver);
+    if (ver != fgState.MinorVersion) {
+      fgError("Wrong GLES minor version: %d\n", ver);
+    }
+  }
+#endif
 
   return context;
 }
 
+void fgPlatformSetWindow ( SFG_Window *window )
+{
+  if ( window != fgStructure.CurrentWindow && window) {
+    if (eglMakeCurrent(fgDisplay.pDisplay.egl.Display,
+               window->Window.pContext.egl.Surface,
+               window->Window.pContext.egl.Surface,
+               window->Window.Context) == EGL_FALSE)
+      fgError("eglMakeCurrent: err=%x\n", eglGetError());
+  }
+}
+
 /*
  * Really opens a window when handle is available
  */
@@ -99,14 +144,14 @@ void fghPlatformOpenWindowEGL( SFG_Window* window )
   EGLSurface surface = eglCreateWindowSurface(display, config, window->Window.Handle, NULL);
   if (surface == EGL_NO_SURFACE)
     fgError("Cannot create EGL window surface, err=%x\n", eglGetError());
-  if (eglMakeCurrent(display, surface, surface, window->Window.Context) == EGL_FALSE)
-    fgError("eglMakeCurrent: err=%x\n", eglGetError());
+  window->Window.pContext.egl.Surface = surface;
 
-  //EGLint w, h;
-  //eglQuerySurface(display, surface, EGL_WIDTH, &w);
-  //eglQuerySurface(display, surface, EGL_HEIGHT, &h);
+  fgPlatformSetWindow(window);
+
+  /* EGLint w, h; */
+  /* eglQuerySurface(display, surface, EGL_WIDTH, &w); */
+  /* eglQuerySurface(display, surface, EGL_HEIGHT, &h); */
 
-  window->Window.pContext.egl.Surface = surface;
 }
 
 /*
@@ -114,9 +159,28 @@ void fghPlatformOpenWindowEGL( SFG_Window* window )
  */
 void fghPlatformCloseWindowEGL( SFG_Window* window )
 {
-  eglMakeCurrent(fgDisplay.pDisplay.egl.Display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+  /* Based on fg_window_mswin fgPlatformCloseWindow */
+  if( fgStructure.CurrentWindow == window )
+    eglMakeCurrent(fgDisplay.pDisplay.egl.Display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
   if (window->Window.Context != EGL_NO_CONTEXT) {
-    eglDestroyContext(fgDisplay.pDisplay.egl.Display, window->Window.Context);
+    /* Step through the list of windows. If the rendering context is not being used by another window, then delete it */
+    {
+      GLboolean used = GL_FALSE;
+      SFG_Window *iter;
+
+      for( iter = (SFG_Window*)fgStructure.Windows.First;
+           iter && used == GL_FALSE;
+           iter = (SFG_Window*)iter->Node.Next)
+      {
+        if( (iter->Window.Context == window->Window.Context) &&
+            (iter != window) )
+          used = GL_TRUE;
+      }
+
+      if( !used )
+        eglDestroyContext(fgDisplay.pDisplay.egl.Display, window->Window.Context);
+    }
     window->Window.Context = EGL_NO_CONTEXT;
   }