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] X11 OpenGL ES minor corrections

x11opengles_fix.patch (text/plain), 6.72 KB, created by Scott Percival on 2012-01-08 04:21:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Percival

Created: 2012-01-08 04:21:22 UTC

Size: 6.72 KB

patch

obsolete

>diff -r b5a665fbaedc src/render/opengles/SDL_glesfuncs.h
>--- a/src/render/opengles/SDL_glesfuncs.h	Fri Aug 26 13:23:40 2011 +0100
>+++ b/src/render/opengles/SDL_glesfuncs.h	Sun Jan 08 16:13:33 2012 +0800
>@@ -10,6 +10,7 @@
> SDL_PROC(void, glDrawTexiOES, (GLint, GLint, GLint, GLint, GLint))
> SDL_PROC(void, glEnable, (GLenum))
> SDL_PROC(void, glEnableClientState, (GLenum))
>+SDL_PROC(void, glFinish, (void))
> SDL_PROC(void, glGenTextures, (GLsizei, GLuint *))
> SDL_PROC(GLenum, glGetError, (void))
> SDL_PROC(void, glGetIntegerv, (GLenum, GLint *))
>diff -r b5a665fbaedc src/render/opengles/SDL_render_gles.c
>--- a/src/render/opengles/SDL_render_gles.c	Fri Aug 26 13:23:40 2011 +0100
>+++ b/src/render/opengles/SDL_render_gles.c	Sun Jan 08 16:13:33 2012 +0800
>@@ -151,6 +151,14 @@
> 
> static int GLES_LoadFunctions(GLES_RenderData * data)
> {
>+#if SDL_VIDEO_DRIVER_UIKIT
>+#define __SDL_NOGETPROCADDR__
>+#elif SDL_VIDEO_DRIVER_ANDROID
>+#define __SDL_NOGETPROCADDR__
>+#elif SDL_VIDEO_DRIVER_PANDORA
>+#define __SDL_NOGETPROCADDR__
>+#endif
>+
> #ifdef __SDL_NOGETPROCADDR__
> #define SDL_PROC(ret,func,params) data->func=func;
> #else
>@@ -267,6 +274,9 @@
>     renderer->driverdata = data;
>     renderer->window = window;
> 
>+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
>+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
>+
>     data->context = SDL_GL_CreateContext(window);
>     if (!data->context) {
>         GLES_DestroyRenderer(renderer);
>@@ -318,6 +328,8 @@
> static void
> GLES_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
> {
>+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
>+    
>     if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
>         /* Rebind the context to the window area and update matrices */
>         SDL_CurrentContext = NULL;
>@@ -325,7 +337,7 @@
> 
>     if (event->event == SDL_WINDOWEVENT_MINIMIZED) {
>         /* According to Apple documentation, we need to finish drawing NOW! */
>-	glFinish();
>+	data->glFinish();
>     }
> }
> 
>diff -r b5a665fbaedc src/render/opengles2/SDL_render_gles2.c
>--- a/src/render/opengles2/SDL_render_gles2.c	Fri Aug 26 13:23:40 2011 +0100
>+++ b/src/render/opengles2/SDL_render_gles2.c	Sun Jan 08 16:13:33 2012 +0800
>@@ -27,7 +27,7 @@
> #include "../SDL_sysrender.h"
> #include "SDL_shaders_gles2.h"
> 
>-/* Used to re-create the window with OpenGL capability */
>+/* Used to re-create the window with OpenGL ES capability */
> extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
> 
> /*************************************************************************************************
>@@ -158,7 +158,15 @@
> 
> static int GLES2_LoadFunctions(GLES2_DriverContext * data)
> {
>-#ifdef __SDL_NOGETPROCADDR__
>+#if SDL_VIDEO_DRIVER_UIKIT
>+#define __SDL_NOGETPROCADDR__
>+#elif SDL_VIDEO_DRIVER_ANDROID
>+#define __SDL_NOGETPROCADDR__
>+#elif SDL_VIDEO_DRIVER_PANDORA
>+#define __SDL_NOGETPROCADDR__
>+#endif
>+
>+#if defined __SDL_NOGETPROCADDR__
> #define SDL_PROC(ret,func,params) data->func=func;
> #else
> #define SDL_PROC(ret,func,params) \
>@@ -1290,6 +1299,10 @@
>         renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
>     }
> 
>+    /* Activate the context, so that queries work */
>+    SDL_GL_MakeCurrent(window, rdata->context);
>+
>+
>     /* Determine supported shader formats */
>     /* HACK: glGetInteger is broken on the Zune HD's compositor, so we just hardcode this */
>     rdata->glGetError();
>diff -r b5a665fbaedc src/video/x11/SDL_x11opengles.c
>--- a/src/video/x11/SDL_x11opengles.c	Fri Aug 26 13:23:40 2011 +0100
>+++ b/src/video/x11/SDL_x11opengles.c	Sun Jan 08 16:13:33 2012 +0800
>@@ -25,10 +25,10 @@
> #include "SDL_x11video.h"
> #include "SDL_x11opengles.h"
> 
>-#define DEFAULT_EGL "/usr/lib/libEGL.so"
>-#define DEFAULT_OGL_ES2 "/usr/lib/libGLESv2.so"
>-#define DEFAULT_OGL_ES_PVR "/usr/lib/libGLES_CM.so"
>-#define DEFAULT_OGL_ES "/usr/lib/libGLESv1_CM.so"
>+#define DEFAULT_EGL "libEGL.so"
>+#define DEFAULT_OGL_ES2 "libGLESv2.so"
>+#define DEFAULT_OGL_ES_PVR "libGLES_CM.so"
>+#define DEFAULT_OGL_ES "libGLESv1_CM.so"
> 
> #define LOAD_FUNC(NAME) \
> 	*((void**)&_this->gles_data->NAME) = dlsym(handle, #NAME); \
>@@ -143,6 +143,7 @@
>     LOAD_FUNC(eglDestroySurface);
>     LOAD_FUNC(eglMakeCurrent);
>     LOAD_FUNC(eglSwapBuffers);
>+    LOAD_FUNC(eglSwapInterval);
> 
>     _this->gles_data->egl_display =
>         _this->gles_data->eglGetDisplay((NativeDisplayType) data->display);
>@@ -304,6 +305,7 @@
> 
>     SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
>     Display *display = data->videodata->display;
>+    SDL_GLContext context = 1;
> 
>     XSync(display, False);
> 
>@@ -323,13 +325,14 @@
>     }
> 
>     _this->gles_data->egl_active = 1;
>+    _this->gles_data->egl_swapinterval = 0;
> 
>     if (X11_GLES_MakeCurrent(_this, window, context) < 0) {
>         X11_GLES_DeleteContext(_this, context);
>         return NULL;
>     }
> 
>-    return (SDL_GLContext)(1);
>+    return context;
> }
> 
> int
>@@ -353,17 +356,34 @@
>     return (retval);
> }
> 
>-static int swapinterval = -1;
> int
> X11_GLES_SetSwapInterval(_THIS, int interval)
> {
>-    return 0;
>+    if (_this->gles_data->egl_active != 1) {
>+        SDL_SetError("OpenGL ES context not active");
>+        return -1;
>+    }
>+
>+    EGLBoolean status;
>+    status = _this->gles_data->eglSwapInterval(_this->gles_data->egl_display, interval);
>+    if (status == EGL_TRUE) {
>+        _this->gles_data->egl_swapinterval = interval;
>+        return 0; 
>+    }
>+
>+    SDL_SetError("Unable to set the EGL swap interval");
>+    return -1;
> }
> 
> int
> X11_GLES_GetSwapInterval(_THIS)
> {
>-    return 0;
>+    if (_this->gles_data->egl_active != 1) {
>+        SDL_SetError("OpenGL ES context not active");
>+        return -1;
>+    }
>+
>+    return _this->gles_data->egl_swapinterval;
> }
> 
> void
>diff -r b5a665fbaedc src/video/x11/SDL_x11opengles.h
>--- a/src/video/x11/SDL_x11opengles.h   Fri Aug 26 13:23:40 2011 +0100
>+++ b/src/video/x11/SDL_x11opengles.h   Sun Jan 08 17:28:35 2012 +0800
>@@ -37,13 +37,14 @@
>     EGLContext egl_context;     /* Current GLES context */
>     EGLSurface egl_surface;
>     EGLConfig egl_config;
>+    int egl_swapinterval;
> 
>       EGLDisplay(*eglGetDisplay) (NativeDisplayType display);
>       EGLBoolean(*eglInitialize) (EGLDisplay dpy, EGLint * major,
>                                   EGLint * minor);
>       EGLBoolean(*eglTerminate) (EGLDisplay dpy);
> 
>-    void *(*eglGetProcAddress) (const GLubyte * procName);
>+    void *(*eglGetProcAddress) (const char * procName);
> 
>       EGLBoolean(*eglChooseConfig) (EGLDisplay dpy,
>                                     const EGLint * attrib_list,
>@@ -68,6 +69,8 @@
> 
>       EGLBoolean(*eglSwapBuffers) (EGLDisplay dpy, EGLSurface draw);
> 
>+      EGLBoolean(*eglSwapInterval) (EGLDisplay dpy, EGLint interval);
>+
>     const char *(*eglQueryString) (EGLDisplay dpy, EGLint name);
> 
>       EGLBoolean(*eglGetConfigAttrib) (EGLDisplay dpy, EGLConfig config,

Actions: View | Diff

Attachments on bug 1242: 644 | 764

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.