FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BlackBerry and Android -Added ability for developer to choose OpenGL ES version (2.0 or 3.0) via glutInitContextVersion (only the major version is used)

Browse Source 
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: https://svn.code.sf.net/p/freeglut/code/trunk@1676 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
dcnieho 2014-01-24 10:35:35 +00:00
parent 47945e4119
commit 8c6c71d29d
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
freeglut/freeglut/src/blackberry/fg_window_blackberry.c
View File

@ -56,9 +56,19 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
} }
fgDisplay.pDisplay.single_native_window = sWindow; 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 */ /* Set window properties */
int orientation = atoi(getenv("ORIENTATION")); 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 #ifdef GL_ES_VERSION_2_0
int screenUsage = SCREEN_USAGE_OPENGL_ES2 | SCREEN_USAGE_ROTATION; 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 #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 window->State.IsFullscreen = GL_TRUE; //XXX Always fullscreen for now
/* Create context */ /* Create context */
fghChooseConfig(&window->Window.pContext.egl.Config);
window->Window.Context = EGL_NO_CONTEXT; window->Window.Context = EGL_NO_CONTEXT;
if( fgState.UseCurrentContext == GL_TRUE ) if( fgState.UseCurrentContext == GL_TRUE )
window->Window.Context = eglGetCurrentContext(); window->Window.Context = eglGetCurrentContext();

12
freeglut/freeglut/src/egl/fg_window_egl.c
View File

@ -38,8 +38,8 @@ int fghChooseConfig(EGLConfig* config) {
#endif #endif
#ifdef TARGET_HOST_BLACKBERRY #ifdef TARGET_HOST_BLACKBERRY
/* Only 888 and 565 seem to work. Based on /* Only 888 and 565 seem to work. Based on
http://qt.gitorious.org/qt/qtbase/source/893deb1a93021cdfabe038cdf1869de33a60cbc9:src/plugins/platforms/qnx/qqnxglcontext.cpp http://qt.gitorious.org/qt/qtbase/source/893deb1a93021cdfabe038cdf1869de33a60cbc9:src/plugins/platforms/qnx/qqnxglcontext.cpp and
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 */ https://twitter.com/BlackBerryDev/status/380720927475912706 */
EGL_BLUE_SIZE, 8, EGL_BLUE_SIZE, 8,
EGL_GREEN_SIZE, 8, EGL_GREEN_SIZE, 8,
EGL_RED_SIZE, 8, EGL_RED_SIZE, 8,
@ -76,7 +76,7 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
EGLConfig eglConfig = window->Window.pContext.egl.Config; EGLConfig eglConfig = window->Window.pContext.egl.Config;
/* Ensure OpenGLES 2.0 context */ /* Ensure OpenGLES 2.0 context */
static const EGLint ctx_attribs[] = { static EGLint ctx_attribs[] = {
#ifdef GL_ES_VERSION_2_0 #ifdef GL_ES_VERSION_2_0
EGL_CONTEXT_CLIENT_VERSION, 2, 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 #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 #endif
EGL_NONE 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); context = eglCreateContext(eglDisplay, eglConfig, EGL_NO_CONTEXT, ctx_attribs);
if (context == EGL_NO_CONTEXT) { if (context == EGL_NO_CONTEXT) {
fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError()); fgWarning("Cannot initialize EGL context, err=%x\n", eglGetError());
@ -92,7 +96,7 @@ EGLContext fghCreateNewContextEGL( SFG_Window* window ) {
EGLint ver = -1; EGLint ver = -1;
eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver); eglQueryContext(fgDisplay.pDisplay.egl.Display, context, EGL_CONTEXT_CLIENT_VERSION, &ver);
#ifdef GL_ES_VERSION_2_0 #ifdef GL_ES_VERSION_2_0
if (ver != 2) if (ver != gles2Ver)
#else #else
if (ver != 1) if (ver != 1)
#endif #endif