BlackBerry and Android -Added ability for developer to choose OpenGL ES version ...

BlackBerry specific
-Added better documentation on required window bit depth for BlackBerry.
-Modified screen format picking so it will choose either RGBA8888 or RGB565 instead of always using RGBA8888

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1676 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/blackberry/fg_window_blackberry.c b/src/blackberry/fg_window_blackberry.c
index e88653c..c0e2ce4 100644 (file)
--- a/src/blackberry/fg_window_blackberry.c
+++ b/src/blackberry/fg_window_blackberry.c
@@ -56,9 +56,19 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     }
     fgDisplay.pDisplay.single_native_window = sWindow;
 
+    /* Choose config and screen format */
+    fghChooseConfig(&window->Window.pContext.egl.Config);
+    int screenFormat = SCREEN_FORMAT_RGBA8888; //Only SCREEN_FORMAT_RGBA8888 and SCREEN_FORMAT_RGB565 are supported. See fg_window_egl for more info
+    int configAttri;
+#define EGL_QUERY_COMP(att, comp) (eglGetConfigAttrib(fgDisplay.pDisplay.egl.Display, window->Window.pContext.egl.Config, att, &configAttri) == GL_TRUE && (configAttri comp))
+    if(EGL_QUERY_COMP(EGL_ALPHA_SIZE, <= 0) && EGL_QUERY_COMP(EGL_RED_SIZE, <= 5) &&
+            EGL_QUERY_COMP(EGL_GREEN_SIZE, <= 6) && EGL_QUERY_COMP(EGL_BLUE_SIZE, <= 5)) {
+        screenFormat = SCREEN_FORMAT_RGB565;
+    }
+#undef EGL_QUERY_COMP
+
     /* Set window properties */
     int orientation = atoi(getenv("ORIENTATION"));
-    int screenFormat = SCREEN_FORMAT_RGBA8888; //Only SCREEN_FORMAT_RGBA8888 and SCREEN_FORMAT_RGB565 are supported. See fg_window_egl for more info
 #ifdef GL_ES_VERSION_2_0
     int screenUsage = SCREEN_USAGE_OPENGL_ES2 | SCREEN_USAGE_ROTATION;
 #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
@@ -180,7 +190,6 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     window->State.IsFullscreen = GL_TRUE; //XXX Always fullscreen for now
 
     /* Create context */
-    fghChooseConfig(&window->Window.pContext.egl.Config);
     window->Window.Context = EGL_NO_CONTEXT;
     if( fgState.UseCurrentContext == GL_TRUE )
         window->Window.Context = eglGetCurrentContext();

diff --git a/src/egl/fg_window_egl.c b/src/egl/fg_window_egl.c
index 2141c5c..4bfbd72 100644 (file)
--- a/src/egl/fg_window_egl.c
+++ b/src/egl/fg_window_egl.c
@@ -38,8 +38,8 @@ int fghChooseConfig(EGLConfig* config) {
 #endif
 #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
-       That's all that is used, and that's what BlackBerry uses for their own internal OpenGL setup, so unless something else is determined, use it */
+       http://qt.gitorious.org/qt/qtbase/source/893deb1a93021cdfabe038cdf1869de33a60cbc9:src/plugins/platforms/qnx/qqnxglcontext.cpp and
+       https://twitter.com/BlackBerryDev/status/380720927475912706 */
     EGL_BLUE_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_RED_SIZE, 8,
@@ -76,7 +76,7 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   EGLConfig eglConfig = window->Window.pContext.egl.Config;
 
   /* Ensure OpenGLES 2.0 context */
-  static const EGLint ctx_attribs[] = {
+  static 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
@@ -84,6 +84,10 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
 #endif
     EGL_NONE
   };
+#ifdef GL_ES_VERSION_2_0
+  int gles2Ver = fgState.MajorVersion <= 2 ? 2 : fgState.MajorVersion;
+  ctx_attribs[1] = gles2Ver;
+#endif
   context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs);
   if (context == EGL_NO_CONTEXT) {
     fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError());
@@ -92,7 +96,7 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
   EGLint ver = -1;
   eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
 #ifdef GL_ES_VERSION_2_0
-  if (ver != 2)
+  if (ver != gles2Ver)
 #else
   if (ver != 1)
 #endif