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] attempt to fix opengles renderer (for reference)

gles.patch (text/plain), 3.20 KB, created by carniblood on 2013-12-18 21:41:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: carniblood

Created: 2013-12-18 21:41:06 UTC

Size: 3.20 KB

patch

obsolete

># HG changeset patch
># User CarniBlood
># Date 1387400478 -32400
>#      Thu Dec 19 06:01:18 2013 +0900
># Node ID 3ccba54ce3389d4c6a4b57b0af171954da6e2442
># Parent  ac809ea54d63caa0f30000cb3284b55f66419097
>fixed gles/gles2 renderer creation fail on Android when default major/minor version doesn't match
>
>diff -r ac809ea54d63 -r 3ccba54ce338 src/render/opengles/SDL_render_gles.c
>--- a/src/render/opengles/SDL_render_gles.c	Mon Dec 16 10:03:26 2013 -0300
>+++ b/src/render/opengles/SDL_render_gles.c	Thu Dec 19 06:01:18 2013 +0900
>@@ -279,15 +279,24 @@
>     GLES_RenderData *data;
>     GLint value;
>     Uint32 windowFlags;
>+    int profileMask, majorVersion, minorVersion;
>+
>+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profileMask);
>+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &majorVersion);
>+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minorVersion);
> 
>     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
>     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
>     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
> 
>     windowFlags = SDL_GetWindowFlags(window);
>-    if (!(windowFlags & SDL_WINDOW_OPENGL)) {
>+    if (!(windowFlags & SDL_WINDOW_OPENGL) ||
>+        profileMask != SDL_GL_CONTEXT_PROFILE_ES || majorVersion != 1 || minorVersion != 1) {
>         if (SDL_RecreateWindow(window, windowFlags | SDL_WINDOW_OPENGL) < 0) {
>             /* Uh oh, better try to put it back... */
>+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
>+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
>+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
>             SDL_RecreateWindow(window, windowFlags);
>             return NULL;
>         }
>diff -r ac809ea54d63 -r 3ccba54ce338 src/render/opengles2/SDL_render_gles2.c
>--- a/src/render/opengles2/SDL_render_gles2.c	Mon Dec 16 10:03:26 2013 -0300
>+++ b/src/render/opengles2/SDL_render_gles2.c	Thu Dec 19 06:01:18 2013 +0900
>@@ -1723,15 +1723,24 @@
>     Uint32 windowFlags;
>     GLint window_framebuffer;
>     GLint value;
>+    int profileMask, majorVersion, minorVersion;
>+
>+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profileMask);
>+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &majorVersion);
>+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minorVersion);
> 
>     SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
>     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
>     SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
> 
>     windowFlags = SDL_GetWindowFlags(window);
>-    if (!(windowFlags & SDL_WINDOW_OPENGL)) {
>+    if (!(windowFlags & SDL_WINDOW_OPENGL) ||
>+        profileMask != SDL_GL_CONTEXT_PROFILE_ES || majorVersion != 2 || minorVersion != 0) {
>         if (SDL_RecreateWindow(window, windowFlags | SDL_WINDOW_OPENGL) < 0) {
>             /* Uh oh, better try to put it back... */
>+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
>+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
>+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
>             SDL_RecreateWindow(window, windowFlags);
>             return NULL;
>         }

Actions: View | Diff

Attachments on bug 2308: 1500

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.