We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch for using GL attributes on Android

sdl_android_gl_set_attributes_patch.diff (text/plain), 5.87 KB, created by Philipp Wiesemann on 2012-10-06 07:19:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Wiesemann

Created: 2012-10-06 07:19:57 UTC

Size: 5.87 KB

patch

obsolete

>diff -r c52863165594 android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Fri Oct 05 22:43:00 2012 -0400
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Sat Oct 06 16:06:53 2012 +0200
>@@ -183,8 +183,8 @@
> 
>     // Java functions called from C
> 
>-    public static boolean createGLContext(int majorVersion, int minorVersion) {
>-        return initEGL(majorVersion, minorVersion);
>+    public static boolean createGLContext(int majorVersion, int minorVersion, int[] attribs) {
>+        return initEGL(majorVersion, minorVersion, attribs);
>     }
> 
>     public static void flipBuffers() {
>@@ -267,7 +267,7 @@
> 
> 
>     // EGL functions
>-    public static boolean initEGL(int majorVersion, int minorVersion) {
>+    public static boolean initEGL(int majorVersion, int minorVersion, int[] attribs) {
>         if (SDLActivity.mEGLDisplay == null) {
>             //Log.v("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion);
> 
>@@ -287,8 +287,17 @@
>                 } else if (majorVersion == 1) {
>                     renderableType = EGL_OPENGL_ES_BIT;
>                 }
>+                int i = 0;
>                 int[] configSpec = {
>-                    //EGL10.EGL_DEPTH_SIZE,   16,
>+                    EGL10.EGL_RED_SIZE, attribs[i++],
>+                    EGL10.EGL_GREEN_SIZE, attribs[i++],
>+                    EGL10.EGL_BLUE_SIZE, attribs[i++],
>+                    EGL10.EGL_ALPHA_SIZE, attribs[i++],
>+                    EGL10.EGL_BUFFER_SIZE, attribs[i++],
>+                    EGL10.EGL_DEPTH_SIZE, attribs[i++],
>+                    EGL10.EGL_STENCIL_SIZE, attribs[i++],
>+                    EGL10.EGL_SAMPLE_BUFFERS, attribs[i++],
>+                    EGL10.EGL_SAMPLES, attribs[i++],
>                     EGL10.EGL_RENDERABLE_TYPE, renderableType,
>                     EGL10.EGL_NONE
>                 };
>@@ -734,7 +743,7 @@
>         ic = new SDLInputConnection(this, true);
> 
>         outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
>-                | EditorInfo.IME_FLAG_NO_FULLSCREEN;
>+                | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
> 
>         return ic;
>     }
>diff -r c52863165594 src/core/android/SDL_android.cpp
>--- a/src/core/android/SDL_android.cpp	Fri Oct 05 22:43:00 2012 -0400
>+++ b/src/core/android/SDL_android.cpp	Sat Oct 06 16:06:53 2012 +0200
>@@ -111,7 +111,7 @@
>     mActivityClass = (jclass)mEnv->NewGlobalRef(cls);
> 
>     midCreateGLContext = mEnv->GetStaticMethodID(mActivityClass,
>-                                "createGLContext","(II)Z");
>+                                "createGLContext","(II[I)Z");
>     midFlipBuffers = mEnv->GetStaticMethodID(mActivityClass,
>                                 "flipBuffers","()V");
>     midAudioInit = mEnv->GetStaticMethodID(mActivityClass, 
>@@ -281,14 +281,30 @@
> };
> int LocalReferenceHolder::s_active;
> 
>-extern "C" SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion)
>+extern "C" SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion,
>+                                int red, int green, int blue, int alpha,
>+                                int buffer, int depth, int stencil,
>+                                int buffers, int samples)
> {
>-    JNIEnv *mEnv = Android_JNI_GetEnv();
>-    if (mEnv->CallStaticBooleanMethod(mActivityClass, midCreateGLContext, majorVersion, minorVersion)) {
>-        return SDL_TRUE;
>-    } else {
>-        return SDL_FALSE;
>-    }
>+    JNIEnv *env = Android_JNI_GetEnv();
>+
>+    jint attribs[] = {
>+        red, green, blue, alpha,
>+        buffer, depth, stencil,
>+        buffers, samples,
>+    };
>+    int len = sizeof (attribs) / sizeof (jint);
>+
>+    jintArray array;
>+
>+    array = env->NewIntArray(len);
>+    env->SetIntArrayRegion(array, 0, len, attribs);
>+
>+    jboolean success = env->CallStaticBooleanMethod(mActivityClass, midCreateGLContext, majorVersion, minorVersion, array);
>+
>+    env->DeleteLocalRef(array);
>+
>+    return success ? SDL_TRUE : SDL_FALSE;
> }
> 
> extern "C" void Android_JNI_SwapWindow()
>diff -r c52863165594 src/core/android/SDL_android.h
>--- a/src/core/android/SDL_android.h	Fri Oct 05 22:43:00 2012 -0400
>+++ b/src/core/android/SDL_android.h	Sat Oct 06 16:06:53 2012 +0200
>@@ -30,7 +30,7 @@
> #include "SDL_rect.h"
> 
> /* Interface from the SDL library into the Android Java activity */
>-extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion);
>+extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
> extern void Android_JNI_SwapWindow();
> extern void Android_JNI_SetActivityTitle(const char *title);
> extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
>diff -r c52863165594 src/video/android/SDL_androidgl.c
>--- a/src/video/android/SDL_androidgl.c	Fri Oct 05 22:43:00 2012 -0400
>+++ b/src/video/android/SDL_androidgl.c	Sat Oct 06 16:06:53 2012 +0200
>@@ -74,7 +74,16 @@
> Android_GL_CreateContext(_THIS, SDL_Window * window)
> {
>     if (!Android_JNI_CreateContext(_this->gl_config.major_version,
>-                                   _this->gl_config.minor_version)) {
>+                                   _this->gl_config.minor_version,
>+                                   _this->gl_config.red_size,
>+                                   _this->gl_config.green_size,
>+                                   _this->gl_config.blue_size,
>+                                   _this->gl_config.alpha_size,
>+                                   _this->gl_config.buffer_size,
>+                                   _this->gl_config.depth_size,
>+                                   _this->gl_config.stencil_size,
>+                                   _this->gl_config.multisamplebuffers,
>+                                   _this->gl_config.multisamplesamples)) {
>         SDL_SetError("Couldn't create OpenGL context - see Android log for details");
>         return NULL;
>     }

Actions: View | Diff

Attachments on bug 1616: 966 | 997

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.