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 (draft) that adds the remaining custom blend modes to the opengl renderer.

SDL2_DRAFT_add_opengl_blendmodes2.diff (text/plain), 55.39 KB, created by Simon Hug on 2017-09-14 22:35:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Hug

Created: 2017-09-14 22:35:50 UTC

Size: 55.39 KB

patch

obsolete

>diff -r feab2c8e1bf5 include/SDL_hints.h
>--- a/include/SDL_hints.h	Thu Sep 14 21:45:14 2017 +0200
>+++ b/include/SDL_hints.h	Fri Sep 15 00:31:07 2017 +0200
>@@ -84,6 +84,17 @@
> #define SDL_HINT_RENDER_DRIVER              "SDL_RENDER_DRIVER"
> 
> /**
>+ *  \brief  A variable controlling whether the OpenGL render driver uses non-power-of-two textures.
>+ *
>+ *  This variable can be set to the following values:
>+ *    "0"       - Disable non-power-of-two textures
>+ *    "1"       - Enable non-power-of-two textures
>+ *
>+ *  By default non-power-of-two textures are used if OpenGL supports them.
>+ */
>+#define SDL_HINT_RENDER_OPENGL_NPOT_TEXTURES   "SDL_RENDER_OPENGL_NPOT_TEXTURES"
>+
>+/**
>  *  \brief  A variable controlling whether the OpenGL render driver uses shaders if they are available.
>  *
>  *  This variable can be set to the following values:
>diff -r feab2c8e1bf5 src/render/opengl/SDL_glfuncs.h
>--- a/src/render/opengl/SDL_glfuncs.h	Thu Sep 14 21:45:14 2017 +0200
>+++ b/src/render/opengl/SDL_glfuncs.h	Fri Sep 15 00:31:07 2017 +0200
>@@ -19,40 +19,96 @@
>   3. This notice may not be removed or altered from any source distribution.
> */
> 
>-/* list of OpenGL functions sorted alphabetically
>-   If you need to use a GL function from the SDL video subsystem,
>-   change its entry from SDL_PROC_UNUSED to SDL_PROC and rebuild.
>-*/
>+/* List of OpenGL functions that will be loaded after the context has been
>+ * created. They are expected to be present or renderer creation will fail.
>+ */
> #define SDL_PROC_UNUSED(ret,func,params)
>+#ifndef SDL_PROC_TEST
>+/* Functions that testgl2.c requires. */
>+#define SDL_PROC_TEST(ret,func,params)
>+#endif
> 
>+/* Supported by OpenGL 1.0 through 4.6 compatibility and core */
>+SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
>+SDL_PROC(void, glClear, (GLbitfield))
>+SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
>+SDL_PROC_UNUSED(void, glClearDepth, (GLclampd))
>+SDL_PROC_UNUSED(void, glClearStencil, (GLint))
>+SDL_PROC_UNUSED(void, glColorMask, (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha))
>+SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
>+SDL_PROC_TEST(void, glDepthFunc, (GLenum func))
>+SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
>+SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
>+SDL_PROC(void, glDisable, (GLenum cap))
>+SDL_PROC_UNUSED(void, glDrawBuffer, (GLenum mode))
>+SDL_PROC(void, glEnable, (GLenum cap))
>+SDL_PROC_UNUSED(void, glFinish, (void))
>+SDL_PROC_UNUSED(void, glFlush, (void))
>+SDL_PROC_UNUSED(void, glFrontFace, (GLenum mode))
>+SDL_PROC_UNUSED(void, glGetBooleanv, (GLenum pname, GLboolean * params))
>+SDL_PROC_UNUSED(void, glGetDoublev, (GLenum pname, GLdouble * params))
>+SDL_PROC(GLenum, glGetError, (void))
>+SDL_PROC_UNUSED(void, glGetFloatv, (GLenum pname, GLfloat * params))
>+SDL_PROC(void, glGetIntegerv, (GLenum pname, GLint * params))
>+SDL_PROC(const GLubyte *, glGetString, (GLenum name))
>+SDL_PROC_UNUSED(void, glGetTexImage, (GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels))
>+SDL_PROC_UNUSED(void, glGetTexLevelParameterfv, (GLenum target, GLint level, GLenum pname, GLfloat * params))
>+SDL_PROC_UNUSED(void, glGetTexLevelParameteriv, (GLenum target, GLint level, GLenum pname, GLint * params))
>+SDL_PROC_UNUSED(void, glGetTexParameterfv, (GLenum target, GLenum pname, GLfloat * params))
>+SDL_PROC_UNUSED(void, glGetTexParameteriv, (GLenum target, GLenum pname, GLint * params))
>+SDL_PROC_UNUSED(void, glHint, (GLenum target, GLenum mode))
>+SDL_PROC_UNUSED(GLboolean, glIsEnabled, (GLenum cap))
>+SDL_PROC_UNUSED(void, glLineWidth, (GLfloat width))
>+SDL_PROC_UNUSED(void, glLogicOp, (GLenum opcode))
>+SDL_PROC_UNUSED(void, glPixelStoref, (GLenum pname, GLfloat param))
>+SDL_PROC(void, glPixelStorei, (GLenum pname, GLint param))
>+SDL_PROC_UNUSED(void, glPointSize, (GLfloat size))
>+SDL_PROC_UNUSED(void, glPolygonMode, (GLenum face, GLenum mode))
>+SDL_PROC(void, glReadBuffer, (GLenum mode))
>+SDL_PROC(void, glReadPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels))
>+SDL_PROC(void, glScissor, (GLint x, GLint y, GLsizei width, GLsizei height))
>+SDL_PROC_UNUSED(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
>+SDL_PROC_UNUSED(void, glStencilMask, (GLuint mask))
>+SDL_PROC_UNUSED(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
>+SDL_PROC_UNUSED(void, glTexImage1D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels))
>+SDL_PROC(void, glTexImage2D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels))
>+SDL_PROC_UNUSED(void, glTexParameterf, (GLenum target, GLenum pname, GLfloat param))
>+SDL_PROC_UNUSED(void, glTexParameterfv, (GLenum target, GLenum pname, const GLfloat * params))
>+SDL_PROC(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
>+SDL_PROC_UNUSED(void, glTexParameteriv, (GLenum target, GLenum pname, const GLint * params))
>+SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
>+
>+/* Supported by OpenGL 1.1 through 4.6 compatibility and core */
>+SDL_PROC(void, glBindTexture, (GLenum, GLuint))
>+SDL_PROC_UNUSED(void, glCopyTexImage1D, (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border))
>+SDL_PROC_UNUSED(void, glCopyTexImage2D, (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border))
>+SDL_PROC_UNUSED(void, glCopyTexSubImage1D, (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width))
>+SDL_PROC_UNUSED(void, glCopyTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height))
>+SDL_PROC(void, glDeleteTextures, (GLsizei n, const GLuint * textures))
>+SDL_PROC_UNUSED(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
>+SDL_PROC_UNUSED(void, glDrawElements, (GLenum mode, GLsizei count, GLenum type, const GLvoid * indices))
>+SDL_PROC(void, glGenTextures, (GLsizei n, GLuint * textures))
>+SDL_PROC_UNUSED(GLboolean, glIsTexture, (GLuint texture))
>+SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units))
>+SDL_PROC_UNUSED(void, glTexSubImage1D, (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels))
>+SDL_PROC(void, glTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels))
>+
>+/* OpenGL 1.0 */
> SDL_PROC_UNUSED(void, glAccum, (GLenum, GLfloat))
> SDL_PROC_UNUSED(void, glAlphaFunc, (GLenum, GLclampf))
>-SDL_PROC_UNUSED(GLboolean, glAreTexturesResident,
>-                (GLsizei, const GLuint *, GLboolean *))
>-SDL_PROC_UNUSED(void, glArrayElement, (GLint))
> SDL_PROC(void, glBegin, (GLenum))
>-SDL_PROC(void, glBindTexture, (GLenum, GLuint))
>-SDL_PROC_UNUSED(void, glBitmap,
>-                (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat,
>-                 const GLubyte *))
>-SDL_PROC(void, glBlendEquation, (GLenum))
>-SDL_PROC_UNUSED(void, glBlendFunc, (GLenum, GLenum))
>-SDL_PROC(void, glBlendFuncSeparate, (GLenum, GLenum, GLenum, GLenum))
>+SDL_PROC_UNUSED(void, glBitmap, (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *))
> SDL_PROC_UNUSED(void, glCallList, (GLuint))
> SDL_PROC_UNUSED(void, glCallLists, (GLsizei, GLenum, const GLvoid *))
>-SDL_PROC(void, glClear, (GLbitfield))
> SDL_PROC_UNUSED(void, glClearAccum, (GLfloat, GLfloat, GLfloat, GLfloat))
>-SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
>-SDL_PROC_UNUSED(void, glClearDepth, (GLclampd))
> SDL_PROC_UNUSED(void, glClearIndex, (GLfloat))
>-SDL_PROC_UNUSED(void, glClearStencil, (GLint))
> SDL_PROC_UNUSED(void, glClipPlane, (GLenum, const GLdouble *))
> SDL_PROC_UNUSED(void, glColor3b, (GLbyte, GLbyte, GLbyte))
> SDL_PROC_UNUSED(void, glColor3bv, (const GLbyte *))
> SDL_PROC_UNUSED(void, glColor3d, (GLdouble, GLdouble, GLdouble))
> SDL_PROC_UNUSED(void, glColor3dv, (const GLdouble *))
> SDL_PROC_UNUSED(void, glColor3f, (GLfloat, GLfloat, GLfloat))
>-SDL_PROC(void, glColor3fv, (const GLfloat *))
>+SDL_PROC_TEST(void, glColor3fv, (const GLfloat *))
> SDL_PROC_UNUSED(void, glColor3i, (GLint, GLint, GLint))
> SDL_PROC_UNUSED(void, glColor3iv, (const GLint *))
> SDL_PROC_UNUSED(void, glColor3s, (GLshort, GLshort, GLshort))
>@@ -73,59 +129,18 @@
> SDL_PROC_UNUSED(void, glColor4iv, (const GLint *))
> SDL_PROC_UNUSED(void, glColor4s, (GLshort, GLshort, GLshort, GLshort))
> SDL_PROC_UNUSED(void, glColor4sv, (const GLshort *))
>-SDL_PROC_UNUSED(void, glColor4ub,
>-                (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha))
>+SDL_PROC_UNUSED(void, glColor4ub, (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha))
> SDL_PROC_UNUSED(void, glColor4ubv, (const GLubyte * v))
>-SDL_PROC_UNUSED(void, glColor4ui,
>-                (GLuint red, GLuint green, GLuint blue, GLuint alpha))
>+SDL_PROC_UNUSED(void, glColor4ui, (GLuint red, GLuint green, GLuint blue, GLuint alpha))
> SDL_PROC_UNUSED(void, glColor4uiv, (const GLuint * v))
>-SDL_PROC_UNUSED(void, glColor4us,
>-                (GLushort red, GLushort green, GLushort blue, GLushort alpha))
>+SDL_PROC_UNUSED(void, glColor4us, (GLushort red, GLushort green, GLushort blue, GLushort alpha))
> SDL_PROC_UNUSED(void, glColor4usv, (const GLushort * v))
>-SDL_PROC_UNUSED(void, glColorMask,
>-                (GLboolean red, GLboolean green, GLboolean blue,
>-                 GLboolean alpha))
> SDL_PROC_UNUSED(void, glColorMaterial, (GLenum face, GLenum mode))
>-SDL_PROC_UNUSED(void, glColorPointer,
>-                (GLint size, GLenum type, GLsizei stride,
>-                 const GLvoid * pointer))
>-SDL_PROC_UNUSED(void, glCopyPixels,
>-                (GLint x, GLint y, GLsizei width, GLsizei height,
>-                 GLenum type))
>-SDL_PROC_UNUSED(void, glCopyTexImage1D,
>-                (GLenum target, GLint level, GLenum internalFormat, GLint x,
>-                 GLint y, GLsizei width, GLint border))
>-SDL_PROC_UNUSED(void, glCopyTexImage2D,
>-                (GLenum target, GLint level, GLenum internalFormat, GLint x,
>-                 GLint y, GLsizei width, GLsizei height, GLint border))
>-SDL_PROC_UNUSED(void, glCopyTexSubImage1D,
>-                (GLenum target, GLint level, GLint xoffset, GLint x, GLint y,
>-                 GLsizei width))
>-SDL_PROC_UNUSED(void, glCopyTexSubImage2D,
>-                (GLenum target, GLint level, GLint xoffset, GLint yoffset,
>-                 GLint x, GLint y, GLsizei width, GLsizei height))
>-SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
>+SDL_PROC_UNUSED(void, glCopyPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type))
> SDL_PROC_UNUSED(void, glDeleteLists, (GLuint list, GLsizei range))
>-SDL_PROC(void, glDeleteTextures, (GLsizei n, const GLuint * textures))
>-SDL_PROC(void, glDepthFunc, (GLenum func))
>-SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
>-SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
>-SDL_PROC(void, glDisable, (GLenum cap))
>-SDL_PROC_UNUSED(void, glDisableClientState, (GLenum array))
>-SDL_PROC_UNUSED(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
>-SDL_PROC_UNUSED(void, glDrawBuffer, (GLenum mode))
>-SDL_PROC_UNUSED(void, glDrawElements,
>-                (GLenum mode, GLsizei count, GLenum type,
>-                 const GLvoid * indices))
>-SDL_PROC(void, glDrawPixels,
>-         (GLsizei width, GLsizei height, GLenum format, GLenum type,
>-          const GLvoid * pixels))
>+SDL_PROC_UNUSED(void, glDrawPixels, (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels))
> SDL_PROC_UNUSED(void, glEdgeFlag, (GLboolean flag))
>-SDL_PROC_UNUSED(void, glEdgeFlagPointer,
>-                (GLsizei stride, const GLvoid * pointer))
> SDL_PROC_UNUSED(void, glEdgeFlagv, (const GLboolean * flag))
>-SDL_PROC(void, glEnable, (GLenum cap))
>-SDL_PROC_UNUSED(void, glEnableClientState, (GLenum array))
> SDL_PROC(void, glEnd, (void))
> SDL_PROC_UNUSED(void, glEndList, (void))
> SDL_PROC_UNUSED(void, glEvalCoord1d, (GLdouble u))
>@@ -137,72 +152,34 @@
> SDL_PROC_UNUSED(void, glEvalCoord2f, (GLfloat u, GLfloat v))
> SDL_PROC_UNUSED(void, glEvalCoord2fv, (const GLfloat * u))
> SDL_PROC_UNUSED(void, glEvalMesh1, (GLenum mode, GLint i1, GLint i2))
>-SDL_PROC_UNUSED(void, glEvalMesh2,
>-                (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2))
>+SDL_PROC_UNUSED(void, glEvalMesh2, (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2))
> SDL_PROC_UNUSED(void, glEvalPoint1, (GLint i))
> SDL_PROC_UNUSED(void, glEvalPoint2, (GLint i, GLint j))
>-SDL_PROC_UNUSED(void, glFeedbackBuffer,
>-                (GLsizei size, GLenum type, GLfloat * buffer))
>-SDL_PROC_UNUSED(void, glFinish, (void))
>-SDL_PROC_UNUSED(void, glFlush, (void))
>+SDL_PROC_UNUSED(void, glFeedbackBuffer, (GLsizei size, GLenum type, GLfloat * buffer))
> SDL_PROC_UNUSED(void, glFogf, (GLenum pname, GLfloat param))
> SDL_PROC_UNUSED(void, glFogfv, (GLenum pname, const GLfloat * params))
> SDL_PROC_UNUSED(void, glFogi, (GLenum pname, GLint param))
> SDL_PROC_UNUSED(void, glFogiv, (GLenum pname, const GLint * params))
>-SDL_PROC_UNUSED(void, glFrontFace, (GLenum mode))
>-SDL_PROC_UNUSED(void, glFrustum,
>-                (GLdouble left, GLdouble right, GLdouble bottom,
>-                 GLdouble top, GLdouble zNear, GLdouble zFar))
>+SDL_PROC_UNUSED(void, glFrustum, (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar))
> SDL_PROC_UNUSED(GLuint, glGenLists, (GLsizei range))
>-SDL_PROC(void, glGenTextures, (GLsizei n, GLuint * textures))
>-SDL_PROC_UNUSED(void, glGetBooleanv, (GLenum pname, GLboolean * params))
> SDL_PROC_UNUSED(void, glGetClipPlane, (GLenum plane, GLdouble * equation))
>-SDL_PROC_UNUSED(void, glGetDoublev, (GLenum pname, GLdouble * params))
>-SDL_PROC(GLenum, glGetError, (void))
>-SDL_PROC_UNUSED(void, glGetFloatv, (GLenum pname, GLfloat * params))
>-SDL_PROC(void, glGetIntegerv, (GLenum pname, GLint * params))
>-SDL_PROC_UNUSED(void, glGetLightfv,
>-                (GLenum light, GLenum pname, GLfloat * params))
>-SDL_PROC_UNUSED(void, glGetLightiv,
>-                (GLenum light, GLenum pname, GLint * params))
>+SDL_PROC_UNUSED(void, glGetLightfv, (GLenum light, GLenum pname, GLfloat * params))
>+SDL_PROC_UNUSED(void, glGetLightiv, (GLenum light, GLenum pname, GLint * params))
> SDL_PROC_UNUSED(void, glGetMapdv, (GLenum target, GLenum query, GLdouble * v))
> SDL_PROC_UNUSED(void, glGetMapfv, (GLenum target, GLenum query, GLfloat * v))
> SDL_PROC_UNUSED(void, glGetMapiv, (GLenum target, GLenum query, GLint * v))
>-SDL_PROC_UNUSED(void, glGetMaterialfv,
>-                (GLenum face, GLenum pname, GLfloat * params))
>-SDL_PROC_UNUSED(void, glGetMaterialiv,
>-                (GLenum face, GLenum pname, GLint * params))
>+SDL_PROC_UNUSED(void, glGetMaterialfv, (GLenum face, GLenum pname, GLfloat * params))
>+SDL_PROC_UNUSED(void, glGetMaterialiv, (GLenum face, GLenum pname, GLint * params))
> SDL_PROC_UNUSED(void, glGetPixelMapfv, (GLenum map, GLfloat * values))
> SDL_PROC_UNUSED(void, glGetPixelMapuiv, (GLenum map, GLuint * values))
> SDL_PROC_UNUSED(void, glGetPixelMapusv, (GLenum map, GLushort * values))
>-SDL_PROC(void, glGetPointerv, (GLenum pname, GLvoid * *params))
> SDL_PROC_UNUSED(void, glGetPolygonStipple, (GLubyte * mask))
>-SDL_PROC(const GLubyte *, glGetString, (GLenum name))
>-SDL_PROC_UNUSED(void, glGetTexEnvfv,
>-                (GLenum target, GLenum pname, GLfloat * params))
>-SDL_PROC_UNUSED(void, glGetTexEnviv,
>-                (GLenum target, GLenum pname, GLint * params))
>-SDL_PROC_UNUSED(void, glGetTexGendv,
>-                (GLenum coord, GLenum pname, GLdouble * params))
>-SDL_PROC_UNUSED(void, glGetTexGenfv,
>-                (GLenum coord, GLenum pname, GLfloat * params))
>-SDL_PROC_UNUSED(void, glGetTexGeniv,
>-                (GLenum coord, GLenum pname, GLint * params))
>-SDL_PROC_UNUSED(void, glGetTexImage,
>-                (GLenum target, GLint level, GLenum format, GLenum type,
>-                 GLvoid * pixels))
>-SDL_PROC_UNUSED(void, glGetTexLevelParameterfv,
>-                (GLenum target, GLint level, GLenum pname, GLfloat * params))
>-SDL_PROC_UNUSED(void, glGetTexLevelParameteriv,
>-                (GLenum target, GLint level, GLenum pname, GLint * params))
>-SDL_PROC_UNUSED(void, glGetTexParameterfv,
>-                (GLenum target, GLenum pname, GLfloat * params))
>-SDL_PROC_UNUSED(void, glGetTexParameteriv,
>-                (GLenum target, GLenum pname, GLint * params))
>-SDL_PROC_UNUSED(void, glHint, (GLenum target, GLenum mode))
>+SDL_PROC_UNUSED(void, glGetTexEnvfv, (GLenum target, GLenum pname, GLfloat * params))
>+SDL_PROC_UNUSED(void, glGetTexEnviv, (GLenum target, GLenum pname, GLint * params))
>+SDL_PROC_UNUSED(void, glGetTexGendv, (GLenum coord, GLenum pname, GLdouble * params))
>+SDL_PROC_UNUSED(void, glGetTexGenfv, (GLenum coord, GLenum pname, GLfloat * params))
>+SDL_PROC_UNUSED(void, glGetTexGeniv, (GLenum coord, GLenum pname, GLint * params))
> SDL_PROC_UNUSED(void, glIndexMask, (GLuint mask))
>-SDL_PROC_UNUSED(void, glIndexPointer,
>-                (GLenum type, GLsizei stride, const GLvoid * pointer))
> SDL_PROC_UNUSED(void, glIndexd, (GLdouble c))
> SDL_PROC_UNUSED(void, glIndexdv, (const GLdouble * c))
> SDL_PROC_UNUSED(void, glIndexf, (GLfloat c))
>@@ -211,60 +188,34 @@
> SDL_PROC_UNUSED(void, glIndexiv, (const GLint * c))
> SDL_PROC_UNUSED(void, glIndexs, (GLshort c))
> SDL_PROC_UNUSED(void, glIndexsv, (const GLshort * c))
>-SDL_PROC_UNUSED(void, glIndexub, (GLubyte c))
>-SDL_PROC_UNUSED(void, glIndexubv, (const GLubyte * c))
> SDL_PROC_UNUSED(void, glInitNames, (void))
>-SDL_PROC_UNUSED(void, glInterleavedArrays,
>-                (GLenum format, GLsizei stride, const GLvoid * pointer))
>-SDL_PROC_UNUSED(GLboolean, glIsEnabled, (GLenum cap))
> SDL_PROC_UNUSED(GLboolean, glIsList, (GLuint list))
>-SDL_PROC_UNUSED(GLboolean, glIsTexture, (GLuint texture))
> SDL_PROC_UNUSED(void, glLightModelf, (GLenum pname, GLfloat param))
> SDL_PROC_UNUSED(void, glLightModelfv, (GLenum pname, const GLfloat * params))
> SDL_PROC_UNUSED(void, glLightModeli, (GLenum pname, GLint param))
> SDL_PROC_UNUSED(void, glLightModeliv, (GLenum pname, const GLint * params))
> SDL_PROC_UNUSED(void, glLightf, (GLenum light, GLenum pname, GLfloat param))
>-SDL_PROC_UNUSED(void, glLightfv,
>-                (GLenum light, GLenum pname, const GLfloat * params))
>+SDL_PROC_UNUSED(void, glLightfv, (GLenum light, GLenum pname, const GLfloat * params))
> SDL_PROC_UNUSED(void, glLighti, (GLenum light, GLenum pname, GLint param))
>-SDL_PROC_UNUSED(void, glLightiv,
>-                (GLenum light, GLenum pname, const GLint * params))
>+SDL_PROC_UNUSED(void, glLightiv, (GLenum light, GLenum pname, const GLint * params))
> SDL_PROC_UNUSED(void, glLineStipple, (GLint factor, GLushort pattern))
>-SDL_PROC(void, glLineWidth, (GLfloat width))
> SDL_PROC_UNUSED(void, glListBase, (GLuint base))
> SDL_PROC(void, glLoadIdentity, (void))
> SDL_PROC_UNUSED(void, glLoadMatrixd, (const GLdouble * m))
> SDL_PROC_UNUSED(void, glLoadMatrixf, (const GLfloat * m))
> SDL_PROC_UNUSED(void, glLoadName, (GLuint name))
>-SDL_PROC_UNUSED(void, glLogicOp, (GLenum opcode))
>-SDL_PROC_UNUSED(void, glMap1d,
>-                (GLenum target, GLdouble u1, GLdouble u2, GLint stride,
>-                 GLint order, const GLdouble * points))
>-SDL_PROC_UNUSED(void, glMap1f,
>-                (GLenum target, GLfloat u1, GLfloat u2, GLint stride,
>-                 GLint order, const GLfloat * points))
>-SDL_PROC_UNUSED(void, glMap2d,
>-                (GLenum target, GLdouble u1, GLdouble u2, GLint ustride,
>-                 GLint uorder, GLdouble v1, GLdouble v2, GLint vstride,
>-                 GLint vorder, const GLdouble * points))
>-SDL_PROC_UNUSED(void, glMap2f,
>-                (GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
>-                 GLint uorder, GLfloat v1, GLfloat v2, GLint vstride,
>-                 GLint vorder, const GLfloat * points))
>+SDL_PROC_UNUSED(void, glMap1d, (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points))
>+SDL_PROC_UNUSED(void, glMap1f, (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points))
>+SDL_PROC_UNUSED(void, glMap2d, (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points))
>+SDL_PROC_UNUSED(void, glMap2f, (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points))
> SDL_PROC_UNUSED(void, glMapGrid1d, (GLint un, GLdouble u1, GLdouble u2))
> SDL_PROC_UNUSED(void, glMapGrid1f, (GLint un, GLfloat u1, GLfloat u2))
>-SDL_PROC_UNUSED(void, glMapGrid2d,
>-                (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1,
>-                 GLdouble v2))
>-SDL_PROC_UNUSED(void, glMapGrid2f,
>-                (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1,
>-                 GLfloat v2))
>+SDL_PROC_UNUSED(void, glMapGrid2d, (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2))
>+SDL_PROC_UNUSED(void, glMapGrid2f, (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2))
> SDL_PROC_UNUSED(void, glMaterialf, (GLenum face, GLenum pname, GLfloat param))
>-SDL_PROC_UNUSED(void, glMaterialfv,
>-                (GLenum face, GLenum pname, const GLfloat * params))
>+SDL_PROC_UNUSED(void, glMaterialfv, (GLenum face, GLenum pname, const GLfloat * params))
> SDL_PROC_UNUSED(void, glMateriali, (GLenum face, GLenum pname, GLint param))
>-SDL_PROC_UNUSED(void, glMaterialiv,
>-                (GLenum face, GLenum pname, const GLint * params))
>+SDL_PROC_UNUSED(void, glMaterialiv, (GLenum face, GLenum pname, const GLint * params))
> SDL_PROC(void, glMatrixMode, (GLenum mode))
> SDL_PROC_UNUSED(void, glMultMatrixd, (const GLdouble * m))
> SDL_PROC_UNUSED(void, glMultMatrixf, (const GLfloat * m))
>@@ -279,43 +230,26 @@
> SDL_PROC_UNUSED(void, glNormal3iv, (const GLint * v))
> SDL_PROC_UNUSED(void, glNormal3s, (GLshort nx, GLshort ny, GLshort nz))
> SDL_PROC_UNUSED(void, glNormal3sv, (const GLshort * v))
>-SDL_PROC_UNUSED(void, glNormalPointer,
>-                (GLenum type, GLsizei stride, const GLvoid * pointer))
>-SDL_PROC(void, glOrtho,
>-         (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top,
>-          GLdouble zNear, GLdouble zFar))
>+SDL_PROC(void, glOrtho, (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar))
> SDL_PROC_UNUSED(void, glPassThrough, (GLfloat token))
>-SDL_PROC_UNUSED(void, glPixelMapfv,
>-                (GLenum map, GLsizei mapsize, const GLfloat * values))
>-SDL_PROC_UNUSED(void, glPixelMapuiv,
>-                (GLenum map, GLsizei mapsize, const GLuint * values))
>-SDL_PROC_UNUSED(void, glPixelMapusv,
>-                (GLenum map, GLsizei mapsize, const GLushort * values))
>-SDL_PROC_UNUSED(void, glPixelStoref, (GLenum pname, GLfloat param))
>-SDL_PROC(void, glPixelStorei, (GLenum pname, GLint param))
>+SDL_PROC_UNUSED(void, glPixelMapfv, (GLenum map, GLsizei mapsize, const GLfloat * values))
>+SDL_PROC_UNUSED(void, glPixelMapuiv, (GLenum map, GLsizei mapsize, const GLuint * values))
>+SDL_PROC_UNUSED(void, glPixelMapusv, (GLenum map, GLsizei mapsize, const GLushort * values))
> SDL_PROC_UNUSED(void, glPixelTransferf, (GLenum pname, GLfloat param))
> SDL_PROC_UNUSED(void, glPixelTransferi, (GLenum pname, GLint param))
> SDL_PROC_UNUSED(void, glPixelZoom, (GLfloat xfactor, GLfloat yfactor))
>-SDL_PROC(void, glPointSize, (GLfloat size))
>-SDL_PROC_UNUSED(void, glPolygonMode, (GLenum face, GLenum mode))
>-SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units))
> SDL_PROC_UNUSED(void, glPolygonStipple, (const GLubyte * mask))
> SDL_PROC_UNUSED(void, glPopAttrib, (void))
>-SDL_PROC_UNUSED(void, glPopClientAttrib, (void))
> SDL_PROC(void, glPopMatrix, (void))
> SDL_PROC_UNUSED(void, glPopName, (void))
>-SDL_PROC_UNUSED(void, glPrioritizeTextures,
>-                (GLsizei n, const GLuint * textures,
>-                 const GLclampf * priorities))
> SDL_PROC_UNUSED(void, glPushAttrib, (GLbitfield mask))
>-SDL_PROC_UNUSED(void, glPushClientAttrib, (GLbitfield mask))
> SDL_PROC(void, glPushMatrix, (void))
> SDL_PROC_UNUSED(void, glPushName, (GLuint name))
> SDL_PROC_UNUSED(void, glRasterPos2d, (GLdouble x, GLdouble y))
> SDL_PROC_UNUSED(void, glRasterPos2dv, (const GLdouble * v))
> SDL_PROC_UNUSED(void, glRasterPos2f, (GLfloat x, GLfloat y))
> SDL_PROC_UNUSED(void, glRasterPos2fv, (const GLfloat * v))
>-SDL_PROC(void, glRasterPos2i, (GLint x, GLint y))
>+SDL_PROC_UNUSED(void, glRasterPos2i, (GLint x, GLint y))
> SDL_PROC_UNUSED(void, glRasterPos2iv, (const GLint * v))
> SDL_PROC_UNUSED(void, glRasterPos2s, (GLshort x, GLshort y))
> SDL_PROC_UNUSED(void, glRasterPos2sv, (const GLshort * v))
>@@ -327,45 +261,29 @@
> SDL_PROC_UNUSED(void, glRasterPos3iv, (const GLint * v))
> SDL_PROC_UNUSED(void, glRasterPos3s, (GLshort x, GLshort y, GLshort z))
> SDL_PROC_UNUSED(void, glRasterPos3sv, (const GLshort * v))
>-SDL_PROC_UNUSED(void, glRasterPos4d,
>-                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
>+SDL_PROC_UNUSED(void, glRasterPos4d, (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
> SDL_PROC_UNUSED(void, glRasterPos4dv, (const GLdouble * v))
>-SDL_PROC_UNUSED(void, glRasterPos4f,
>-                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
>+SDL_PROC_UNUSED(void, glRasterPos4f, (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
> SDL_PROC_UNUSED(void, glRasterPos4fv, (const GLfloat * v))
> SDL_PROC_UNUSED(void, glRasterPos4i, (GLint x, GLint y, GLint z, GLint w))
> SDL_PROC_UNUSED(void, glRasterPos4iv, (const GLint * v))
>-SDL_PROC_UNUSED(void, glRasterPos4s,
>-                (GLshort x, GLshort y, GLshort z, GLshort w))
>+SDL_PROC_UNUSED(void, glRasterPos4s, (GLshort x, GLshort y, GLshort z, GLshort w))
> SDL_PROC_UNUSED(void, glRasterPos4sv, (const GLshort * v))
>-SDL_PROC(void, glReadBuffer, (GLenum mode))
>-SDL_PROC(void, glReadPixels,
>-         (GLint x, GLint y, GLsizei width, GLsizei height,
>-          GLenum format, GLenum type, GLvoid * pixels))
>-SDL_PROC_UNUSED(void, glRectd,
>-                (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2))
>+SDL_PROC_UNUSED(void, glRectd, (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2))
> SDL_PROC_UNUSED(void, glRectdv, (const GLdouble * v1, const GLdouble * v2))
>-SDL_PROC(void, glRectf,
>-                (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2))
>+SDL_PROC(void, glRectf, (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2))
> SDL_PROC_UNUSED(void, glRectfv, (const GLfloat * v1, const GLfloat * v2))
> SDL_PROC_UNUSED(void, glRecti, (GLint x1, GLint y1, GLint x2, GLint y2))
> SDL_PROC_UNUSED(void, glRectiv, (const GLint * v1, const GLint * v2))
>-SDL_PROC_UNUSED(void, glRects,
>-                (GLshort x1, GLshort y1, GLshort x2, GLshort y2))
>+SDL_PROC_UNUSED(void, glRects, (GLshort x1, GLshort y1, GLshort x2, GLshort y2))
> SDL_PROC_UNUSED(void, glRectsv, (const GLshort * v1, const GLshort * v2))
> SDL_PROC_UNUSED(GLint, glRenderMode, (GLenum mode))
>-SDL_PROC(void, glRotated,
>-                (GLdouble angle, GLdouble x, GLdouble y, GLdouble z))
>-SDL_PROC(void, glRotatef,
>-                (GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
>+SDL_PROC(void, glRotated, (GLdouble angle, GLdouble x, GLdouble y, GLdouble z))
>+SDL_PROC_TEST(void, glRotatef, (GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
> SDL_PROC_UNUSED(void, glScaled, (GLdouble x, GLdouble y, GLdouble z))
> SDL_PROC_UNUSED(void, glScalef, (GLfloat x, GLfloat y, GLfloat z))
>-SDL_PROC(void, glScissor, (GLint x, GLint y, GLsizei width, GLsizei height))
> SDL_PROC_UNUSED(void, glSelectBuffer, (GLsizei size, GLuint * buffer))
>-SDL_PROC(void, glShadeModel, (GLenum mode))
>-SDL_PROC_UNUSED(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
>-SDL_PROC_UNUSED(void, glStencilMask, (GLuint mask))
>-SDL_PROC_UNUSED(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
>+SDL_PROC_TEST(void, glShadeModel, (GLenum mode))
> SDL_PROC_UNUSED(void, glTexCoord1d, (GLdouble s))
> SDL_PROC_UNUSED(void, glTexCoord1dv, (const GLdouble * v))
> SDL_PROC_UNUSED(void, glTexCoord1f, (GLfloat s))
>@@ -390,57 +308,24 @@
> SDL_PROC_UNUSED(void, glTexCoord3iv, (const GLint * v))
> SDL_PROC_UNUSED(void, glTexCoord3s, (GLshort s, GLshort t, GLshort r))
> SDL_PROC_UNUSED(void, glTexCoord3sv, (const GLshort * v))
>-SDL_PROC_UNUSED(void, glTexCoord4d,
>-                (GLdouble s, GLdouble t, GLdouble r, GLdouble q))
>+SDL_PROC_UNUSED(void, glTexCoord4d, (GLdouble s, GLdouble t, GLdouble r, GLdouble q))
> SDL_PROC_UNUSED(void, glTexCoord4dv, (const GLdouble * v))
>-SDL_PROC_UNUSED(void, glTexCoord4f,
>-                (GLfloat s, GLfloat t, GLfloat r, GLfloat q))
>+SDL_PROC_UNUSED(void, glTexCoord4f, (GLfloat s, GLfloat t, GLfloat r, GLfloat q))
> SDL_PROC_UNUSED(void, glTexCoord4fv, (const GLfloat * v))
> SDL_PROC_UNUSED(void, glTexCoord4i, (GLint s, GLint t, GLint r, GLint q))
> SDL_PROC_UNUSED(void, glTexCoord4iv, (const GLint * v))
>-SDL_PROC_UNUSED(void, glTexCoord4s,
>-                (GLshort s, GLshort t, GLshort r, GLshort q))
>+SDL_PROC_UNUSED(void, glTexCoord4s, (GLshort s, GLshort t, GLshort r, GLshort q))
> SDL_PROC_UNUSED(void, glTexCoord4sv, (const GLshort * v))
>-SDL_PROC_UNUSED(void, glTexCoordPointer,
>-                (GLint size, GLenum type, GLsizei stride,
>-                 const GLvoid * pointer))
>-SDL_PROC(void, glTexEnvf, (GLenum target, GLenum pname, GLfloat param))
>-SDL_PROC_UNUSED(void, glTexEnvfv,
>-                (GLenum target, GLenum pname, const GLfloat * params))
>+SDL_PROC_UNUSED(void, glTexEnvf, (GLenum target, GLenum pname, GLfloat param))
>+SDL_PROC_UNUSED(void, glTexEnvfv, (GLenum target, GLenum pname, const GLfloat * params))
> SDL_PROC_UNUSED(void, glTexEnvi, (GLenum target, GLenum pname, GLint param))
>-SDL_PROC_UNUSED(void, glTexEnviv,
>-                (GLenum target, GLenum pname, const GLint * params))
>+SDL_PROC_UNUSED(void, glTexEnviv, (GLenum target, GLenum pname, const GLint * params))
> SDL_PROC_UNUSED(void, glTexGend, (GLenum coord, GLenum pname, GLdouble param))
>-SDL_PROC_UNUSED(void, glTexGendv,
>-                (GLenum coord, GLenum pname, const GLdouble * params))
>+SDL_PROC_UNUSED(void, glTexGendv, (GLenum coord, GLenum pname, const GLdouble * params))
> SDL_PROC_UNUSED(void, glTexGenf, (GLenum coord, GLenum pname, GLfloat param))
>-SDL_PROC_UNUSED(void, glTexGenfv,
>-                (GLenum coord, GLenum pname, const GLfloat * params))
>+SDL_PROC_UNUSED(void, glTexGenfv, (GLenum coord, GLenum pname, const GLfloat * params))
> SDL_PROC_UNUSED(void, glTexGeni, (GLenum coord, GLenum pname, GLint param))
>-SDL_PROC_UNUSED(void, glTexGeniv,
>-                (GLenum coord, GLenum pname, const GLint * params))
>-SDL_PROC_UNUSED(void, glTexImage1D,
>-                (GLenum target, GLint level, GLint internalformat,
>-                 GLsizei width, GLint border, GLenum format, GLenum type,
>-                 const GLvoid * pixels))
>-SDL_PROC(void, glTexImage2D,
>-         (GLenum target, GLint level, GLint internalformat, GLsizei width,
>-          GLsizei height, GLint border, GLenum format, GLenum type,
>-          const GLvoid * pixels))
>-SDL_PROC_UNUSED(void, glTexParameterf,
>-                (GLenum target, GLenum pname, GLfloat param))
>-SDL_PROC_UNUSED(void, glTexParameterfv,
>-                (GLenum target, GLenum pname, const GLfloat * params))
>-SDL_PROC(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
>-SDL_PROC_UNUSED(void, glTexParameteriv,
>-                (GLenum target, GLenum pname, const GLint * params))
>-SDL_PROC_UNUSED(void, glTexSubImage1D,
>-                (GLenum target, GLint level, GLint xoffset, GLsizei width,
>-                 GLenum format, GLenum type, const GLvoid * pixels))
>-SDL_PROC(void, glTexSubImage2D,
>-         (GLenum target, GLint level, GLint xoffset, GLint yoffset,
>-          GLsizei width, GLsizei height, GLenum format, GLenum type,
>-          const GLvoid * pixels))
>+SDL_PROC_UNUSED(void, glTexGeniv, (GLenum coord, GLenum pname, const GLint * params))
> SDL_PROC_UNUSED(void, glTranslated, (GLdouble x, GLdouble y, GLdouble z))
> SDL_PROC(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z))
> SDL_PROC_UNUSED(void, glVertex2d, (GLdouble x, GLdouble y))
>@@ -454,25 +339,44 @@
> SDL_PROC_UNUSED(void, glVertex3d, (GLdouble x, GLdouble y, GLdouble z))
> SDL_PROC_UNUSED(void, glVertex3dv, (const GLdouble * v))
> SDL_PROC_UNUSED(void, glVertex3f, (GLfloat x, GLfloat y, GLfloat z))
>-SDL_PROC(void, glVertex3fv, (const GLfloat * v))
>+SDL_PROC_TEST(void, glVertex3fv, (const GLfloat * v))
> SDL_PROC_UNUSED(void, glVertex3i, (GLint x, GLint y, GLint z))
> SDL_PROC_UNUSED(void, glVertex3iv, (const GLint * v))
> SDL_PROC_UNUSED(void, glVertex3s, (GLshort x, GLshort y, GLshort z))
> SDL_PROC_UNUSED(void, glVertex3sv, (const GLshort * v))
>-SDL_PROC_UNUSED(void, glVertex4d,
>-                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
>+SDL_PROC_UNUSED(void, glVertex4d, (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
> SDL_PROC_UNUSED(void, glVertex4dv, (const GLdouble * v))
>-SDL_PROC_UNUSED(void, glVertex4f,
>-                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
>+SDL_PROC_UNUSED(void, glVertex4f, (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
> SDL_PROC_UNUSED(void, glVertex4fv, (const GLfloat * v))
> SDL_PROC_UNUSED(void, glVertex4i, (GLint x, GLint y, GLint z, GLint w))
> SDL_PROC_UNUSED(void, glVertex4iv, (const GLint * v))
>-SDL_PROC_UNUSED(void, glVertex4s,
>-                (GLshort x, GLshort y, GLshort z, GLshort w))
>+SDL_PROC_UNUSED(void, glVertex4s, (GLshort x, GLshort y, GLshort z, GLshort w))
> SDL_PROC_UNUSED(void, glVertex4sv, (const GLshort * v))
>-SDL_PROC_UNUSED(void, glVertexPointer,
>-                (GLint size, GLenum type, GLsizei stride,
>-                 const GLvoid * pointer))
>-SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
>+
>+/* OpenGL 1.1 */
>+SDL_PROC_UNUSED(GLboolean, glAreTexturesResident, (GLsizei, const GLuint *, GLboolean *))
>+SDL_PROC_UNUSED(void, glArrayElement, (GLint))
>+SDL_PROC_UNUSED(void, glColorPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
>+SDL_PROC_UNUSED(void, glDisableClientState, (GLenum array))
>+SDL_PROC_UNUSED(void, glEdgeFlagPointer, (GLsizei stride, const GLvoid * pointer))
>+SDL_PROC_UNUSED(void, glEnableClientState, (GLenum array))
>+SDL_PROC(void, glGetPointerv, (GLenum pname, GLvoid * *params))
>+SDL_PROC_UNUSED(void, glIndexPointer, (GLenum type, GLsizei stride, const GLvoid * pointer))
>+SDL_PROC_UNUSED(void, glIndexub, (GLubyte c))
>+SDL_PROC_UNUSED(void, glIndexubv, (const GLubyte * c))
>+SDL_PROC_UNUSED(void, glInterleavedArrays, (GLenum format, GLsizei stride, const GLvoid * pointer))
>+SDL_PROC_UNUSED(void, glNormalPointer, (GLenum type, GLsizei stride, const GLvoid * pointer))
>+SDL_PROC_UNUSED(void, glPopClientAttrib, (void))
>+SDL_PROC_UNUSED(void, glPrioritizeTextures, (GLsizei n, const GLuint * textures, const GLclampf * priorities))
>+SDL_PROC_UNUSED(void, glPushClientAttrib, (GLbitfield mask))
>+SDL_PROC_UNUSED(void, glTexCoordPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
>+SDL_PROC_UNUSED(void, glVertexPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid * pointer))
>+
>+/* OpenGL 1.4 */
>+
>+/* There are a few ways to load the blending functions. The GL_CreateRenderer function takes care of that. */
>+/* SDL_PROC_UNUSED(void, glBlendEquation, (GLenum)) */
>+/* SDL_PROC_UNUSED(void, glBlendFuncSeparate, (GLenum, GLenum, GLenum, GLenum)) */
>+
> 
> /* vi: set ts=4 sw=4 expandtab: */
>diff -r feab2c8e1bf5 src/render/opengl/SDL_render_gl.c
>--- a/src/render/opengl/SDL_render_gl.c	Thu Sep 14 21:45:14 2017 +0200
>+++ b/src/render/opengl/SDL_render_gl.c	Fri Sep 15 00:31:07 2017 +0200
>@@ -114,6 +114,8 @@
> typedef struct
> {
>     SDL_GLContext context;
>+    int version_major;
>+    int version_minor;
> 
>     SDL_bool debug_enabled;
>     SDL_bool GL_ARB_debug_output_supported;
>@@ -124,30 +126,43 @@
> 
>     SDL_bool GL_ARB_texture_non_power_of_two_supported;
>     SDL_bool GL_ARB_texture_rectangle_supported;
>+    SDL_bool glBlendEquation_supported;
>+    SDL_bool glBlendEquationSeparate_supported;
>+    SDL_bool blend_subtract_supported;
>+    SDL_bool blend_minmax_supported;
>+    SDL_bool glBlendFuncSeparate_supported;
>+    SDL_bool GL_ARB_multitexture_supported;
>+    SDL_bool GL_EXT_framebuffer_object_supported;
>+
>     struct {
>         GL_Shader shader;
>         Uint32 color;
>         SDL_BlendMode blendMode;
>     } current;
> 
>-    SDL_bool GL_EXT_framebuffer_object_supported;
>-    GL_FBOList *framebuffers;
>-
>     /* OpenGL functions */
> #define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
> #include "SDL_glfuncs.h"
> #undef SDL_PROC
> 
>+    /* Blend equation functions */
>+    PFNGLBLENDEQUATIONPROC glBlendEquation;
>+    PFNGLBLENDEQUATIONSEPARATEPROC glBlendEquationSeparate;
>+
>+    /* Separate blending function */
>+    PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate;
>+
>     /* Multitexture support */
>-    SDL_bool GL_ARB_multitexture_supported;
>     PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
>     GLint num_texture_units;
> 
>+    /* Framebuffer support */
>     PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
>     PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
>     PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
>     PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
>     PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
>+    GL_FBOList *framebuffers;
> 
>     /* Shader support */
>     GL_ShaderContext *shaders;
>@@ -391,15 +406,19 @@
> {
>     SDL_Renderer *renderer;
>     GL_RenderData *data;
>+    const GLubyte *gl_version;
>+    int profile_mask, major, minor, context_flags;
>     GLint value;
>     Uint32 window_flags;
>-    int profile_mask = 0, major = 0, minor = 0;
>     SDL_bool changed_window = SDL_FALSE;
> 
>-    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask);
>-    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);
>-    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);
>-    
>+    if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask) != 0 ||
>+        SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major) != 0 ||
>+        SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor) != 0) {
>+        SDL_SetError("Could not get OpenGL attributes");
>+        return NULL;
>+    }
>+
>     window_flags = SDL_GetWindowFlags(window);
>     if (!(window_flags & SDL_WINDOW_OPENGL) ||
>         profile_mask == SDL_GL_CONTEXT_PROFILE_ES || major != RENDERER_CONTEXT_MAJOR || minor != RENDERER_CONTEXT_MINOR) {
>@@ -470,6 +489,19 @@
>         goto error;
>     }
> 
>+    gl_version = data->glGetString(GL_VERSION);
>+    if (gl_version && SDL_sscanf(gl_version, "%d.%d", &data->version_major, &data->version_minor) != 2) {
>+        data->version_major = 0;
>+        data->version_minor = 0;
>+    }
>+
>+    /* With no textures, there's no point in supporting OpenGL 1.0. */
>+    if (data->version_major == 1 && data->version_minor == 0) {
>+        SDL_SetError("OpenGL 1.0 is not supported");
>+        GL_DestroyRenderer(renderer);
>+        goto error;
>+    }
>+
> #ifdef __MACOSX__
>     /* Enable multi-threaded rendering */
>     /* Disabled until Ryan finishes his VBO/PBO code...
>@@ -477,6 +509,11 @@
>      */
> #endif
> 
>+    /* OpenGL 1.1 doesn't have many formats without extensions. */
>+    if (data->version_major == 1 && data->version_minor <= 1) {
>+        renderer->info.texture_formats[0] = SDL_PIXELFORMAT_ABGR8888;
>+    }
>+
>     if (flags & SDL_RENDERER_PRESENTVSYNC) {
>         SDL_GL_SetSwapInterval(1);
>     } else {
>@@ -487,8 +524,7 @@
>     }
> 
>     /* Check for debug output support */
>-    if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_FLAGS, &value) == 0 &&
>-        (value & SDL_GL_CONTEXT_DEBUG_FLAG)) {
>+    if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_FLAGS, &context_flags) == 0 && (context_flags & SDL_GL_CONTEXT_DEBUG_FLAG)) {
>         data->debug_enabled = SDL_TRUE;
>     }
>     if (data->debug_enabled && SDL_GL_ExtensionSupported("GL_ARB_debug_output")) {
>@@ -503,11 +539,85 @@
>         data->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
>     }
> 
>-    if (SDL_GL_ExtensionSupported("GL_ARB_texture_non_power_of_two")) {
>-        data->GL_ARB_texture_non_power_of_two_supported = SDL_TRUE;
>-    } else if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle") ||
>-               SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) {
>-        data->GL_ARB_texture_rectangle_supported = SDL_TRUE;
>+    /* Check for blend equation support.
>+     * glBlendEquation is in OpenGL 1.4 and higher (core and compatibility) or the
>+     * GL_EXT_blend_minmax and GL_EXT_blend_subtract extensions. It is also in the
>+     * ARB_imaging subset, but that may not be hardware accelerated.
>+     */
>+    if ((data->version_major == 1 && data->version_minor >= 4) || data->version_major >= 2) {
>+        data->glBlendEquation = (PFNGLBLENDEQUATIONPROC)SDL_GL_GetProcAddress("glBlendEquation");
>+        if (data->glBlendEquation) {
>+            data->glBlendEquation_supported = SDL_TRUE;
>+            data->blend_subtract_supported = SDL_TRUE;
>+            data->blend_minmax_supported = SDL_TRUE;
>+        }
>+    }
>+    if (!data->glBlendEquation_supported) {
>+        if (SDL_GL_ExtensionSupported("GL_EXT_blend_subtract")) {
>+            data->blend_subtract_supported = SDL_TRUE;
>+        }
>+        if (SDL_GL_ExtensionSupported("GL_EXT_blend_minmax")) {
>+            data->blend_minmax_supported = SDL_TRUE;
>+        }
>+        /* Either extension will define the function. */
>+        if (data->blend_minmax_supported || data->blend_minmax_supported) {
>+            data->glBlendEquation = (PFNGLBLENDEQUATIONPROC)SDL_GL_GetProcAddress("glBlendEquationEXT");
>+            if (data->glBlendEquation) {
>+                data->glBlendEquation_supported = SDL_TRUE;
>+            }
>+        }
>+    }
>+    /* The separate version is in OpenGL 2.0 and higher (core and compatibility) or
>+     * the GL_EXT_blend_equation_separate extension.
>+     */
>+    if (data->version_major >= 2) {
>+        data->glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)SDL_GL_GetProcAddress("glBlendEquationSeparate");
>+        if (data->glBlendEquationSeparate) {
>+            data->glBlendEquationSeparate_supported = SDL_TRUE;
>+            data->blend_subtract_supported = SDL_TRUE;
>+            data->blend_minmax_supported = SDL_TRUE;
>+        }
>+    }
>+    if (!data->glBlendEquationSeparate_supported && SDL_GL_ExtensionSupported("GL_EXT_blend_equation_separate")) {
>+        data->glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)SDL_GL_GetProcAddress("glBlendEquationSeparateEXT");
>+        if (data->glBlendEquationSeparate) {
>+            data->glBlendEquationSeparate_supported = SDL_TRUE;
>+        }
>+    }
>+
>+    /* Check for separate blend function support.
>+     * glBlendFuncSeparate is in OpenGL 1.4 and higher (core and compatibility) or
>+     * the GL_EXT_blend_func_separate extension.
>+     */
>+    if ((data->version_major == 1 && data->version_minor >= 4) || data->version_major >= 2) {
>+        data->glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)SDL_GL_GetProcAddress("glBlendFuncSeparate");
>+        if (data->glBlendFuncSeparate) {
>+            data->glBlendFuncSeparate_supported = SDL_TRUE;
>+        }
>+    }
>+    if (!data->glBlendFuncSeparate_supported && SDL_GL_ExtensionSupported("GL_EXT_blend_func_separate")) {
>+        data->glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)SDL_GL_GetProcAddress("glBlendFuncSeparateEXT");
>+        if (data->glBlendFuncSeparate) {
>+            data->glBlendFuncSeparate_supported = SDL_TRUE;
>+        }
>+    }
>+
>+    /* Check for the requirement of power-of-two texture dimensions.
>+     * This is required in OpenGL 1.1 through 1.5, but was relaxed for OpenGL 2.0
>+     * and higher or if the GL_ARB_texture_non_power_of_two extension is present.
>+     * The GL_ARB/EXT_texture_rectangle extensions provide another way for NPOT textures
>+     * with some limitations: No repeat wrap mode, no mipmapping, and the range of the
>+     * texture coordinates is [0..w]x[0..h] instead of [0..1]x[0..1].
>+     */
>+    if (SDL_GetHintBoolean(SDL_HINT_RENDER_OPENGL_NPOT_TEXTURES, SDL_TRUE)) {
>+        if (data->version_major >= 2) {
>+            data->GL_ARB_texture_non_power_of_two_supported = SDL_TRUE;
>+        } if (SDL_GL_ExtensionSupported("GL_ARB_texture_non_power_of_two")) {
>+            data->GL_ARB_texture_non_power_of_two_supported = SDL_TRUE;
>+        } else if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle") ||
>+                   SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) {
>+            data->GL_ARB_texture_rectangle_supported = SDL_TRUE;
>+        }
>     }
>     if (data->GL_ARB_texture_rectangle_supported) {
>         data->glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB, &value);
>@@ -634,6 +744,10 @@
>         return GL_FUNC_SUBTRACT;
>     case SDL_BLENDOPERATION_REV_SUBTRACT:
>         return GL_FUNC_REVERSE_SUBTRACT;
>+    case SDL_BLENDOPERATION_MINIMUM:
>+        return GL_MIN;
>+    case SDL_BLENDOPERATION_MAXIMUM:
>+        return GL_MAX;
>     default:
>         return GL_INVALID_ENUM;
>     }
>@@ -642,6 +756,8 @@
> static SDL_bool
> GL_SupportsBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode)
> {
>+    GL_RenderData *renderdata = (GL_RenderData *)renderer->driverdata;
>+
>     SDL_BlendFactor srcColorFactor = SDL_GetBlendModeSrcColorFactor(blendMode);
>     SDL_BlendFactor srcAlphaFactor = SDL_GetBlendModeSrcAlphaFactor(blendMode);
>     SDL_BlendOperation colorOperation = SDL_GetBlendModeColorOperation(blendMode);
>@@ -657,16 +773,44 @@
>         GetBlendEquation(alphaOperation) == GL_INVALID_ENUM) {
>         return SDL_FALSE;
>     }
>-    if (colorOperation != alphaOperation) {
>+
>+    if ((srcColorFactor != srcAlphaFactor || dstColorFactor != dstAlphaFactor) && !renderdata->glBlendEquationSeparate_supported) {
>         return SDL_FALSE;
>     }
>+    if (colorOperation != alphaOperation && !renderdata->glBlendEquationSeparate_supported) {
>+        return SDL_FALSE;
>+    } else if (colorOperation != SDL_BLENDOPERATION_ADD) {
>+        if (!renderdata->glBlendEquation_supported) {
>+            return SDL_FALSE;
>+        }
>+        switch (colorOperation) {
>+        case SDL_BLENDOPERATION_SUBTRACT:
>+        case SDL_BLENDOPERATION_REV_SUBTRACT:
>+            if (!renderdata->blend_subtract_supported) {
>+                return SDL_FALSE;
>+            }
>+            break;
>+        case SDL_BLENDOPERATION_MINIMUM:
>+        case SDL_BLENDOPERATION_MAXIMUM:
>+            if (!renderdata->blend_minmax_supported) {
>+                return SDL_FALSE;
>+            }
>+            break;
>+        case SDL_BLENDOPERATION_ADD:
>+            break;
>+        }
>+    }
>+
>     return SDL_TRUE;
> }
> 
>-SDL_FORCE_INLINE int
>-power_of_2(int input)
>+SDL_FORCE_INLINE Sint32
>+power_of_2(Sint32 input)
> {
>-    int value = 1;
>+    Sint32 value = 1;
>+    if (input <= 0 || input > (1 << 30)) {
>+        return -1;
>+    }
> 
>     while (value < input) {
>         value <<= 1;
>@@ -679,6 +823,11 @@
>                GLint* internalFormat, GLenum* format, GLenum* type)
> {
>     switch (pixel_format) {
>+    case SDL_PIXELFORMAT_ABGR8888:
>+        *internalFormat = GL_RGBA8;
>+        *format = GL_RGBA;
>+        *type = GL_UNSIGNED_BYTE;
>+        break;
>     case SDL_PIXELFORMAT_ARGB8888:
>         *internalFormat = GL_RGBA8;
>         *format = GL_BGRA;
>@@ -745,6 +894,30 @@
>         return SDL_OutOfMemory();
>     }
> 
>+    if (renderdata->GL_ARB_texture_non_power_of_two_supported) {
>+        data->type = GL_TEXTURE_2D;
>+        texture_w = texture->w;
>+        texture_h = texture->h;
>+        data->texw = 1.0f;
>+        data->texh = 1.0f;
>+    } else if (renderdata->GL_ARB_texture_rectangle_supported) {
>+        data->type = GL_TEXTURE_RECTANGLE_ARB;
>+        texture_w = texture->w;
>+        texture_h = texture->h;
>+        data->texw = (GLfloat) texture_w;
>+        data->texh = (GLfloat) texture_h;
>+    } else {
>+        data->type = GL_TEXTURE_2D;
>+        texture_w = power_of_2(texture->w);
>+        texture_h = power_of_2(texture->h);
>+        if (texture_w <= 0 || texture_h <= 0) {
>+            SDL_free(data);
>+            return SDL_SetError("Texture dimensions are invalid");
>+        }
>+        data->texw = (GLfloat) (texture->w) / texture_w;
>+        data->texh = (GLfloat) texture->h / texture_h;
>+    }
>+
>     if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
>         size_t size;
>         data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
>@@ -783,26 +956,6 @@
>     }
>     texture->driverdata = data;
> 
>-    if (renderdata->GL_ARB_texture_non_power_of_two_supported) {
>-        data->type = GL_TEXTURE_2D;
>-        texture_w = texture->w;
>-        texture_h = texture->h;
>-        data->texw = 1.0f;
>-        data->texh = 1.0f;
>-    } else if (renderdata->GL_ARB_texture_rectangle_supported) {
>-        data->type = GL_TEXTURE_RECTANGLE_ARB;
>-        texture_w = texture->w;
>-        texture_h = texture->h;
>-        data->texw = (GLfloat) texture_w;
>-        data->texh = (GLfloat) texture_h;
>-    } else {
>-        data->type = GL_TEXTURE_2D;
>-        texture_w = power_of_2(texture->w);
>-        texture_h = power_of_2(texture->h);
>-        data->texw = (GLfloat) (texture->w) / texture_w;
>-        data->texh = (GLfloat) texture->h / texture_h;
>-    }
>-
>     data->format = format;
>     data->formattype = type;
>     scaleMode = GetScaleQuality();
>@@ -814,10 +967,11 @@
>        and setting it causes an INVALID_ENUM error in the latest NVidia drivers.
>     */
>     if (data->type != GL_TEXTURE_RECTANGLE_ARB) {
>-        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
>-                                    GL_CLAMP_TO_EDGE);
>-        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
>-                                    GL_CLAMP_TO_EDGE);
>+        /* CLAMP_TO_EDGE was added in OpenGL 1.2. */
>+        if (renderdata->version_minor >= 2 || renderdata->version_major >= 2) {
>+            renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
>+            renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
>+        }
>     }
> #ifdef __MACOSX__
> #ifndef GL_TEXTURE_STORAGE_HINT_APPLE
>@@ -837,7 +991,8 @@
>                                     GL_STORAGE_CACHED_APPLE);
>     }
>     if (texture->access == SDL_TEXTUREACCESS_STREAMING
>-        && texture->format == SDL_PIXELFORMAT_ARGB8888
>+        && (texture->format == SDL_PIXELFORMAT_ARGB8888
>+        || texture->format == SDL_PIXELFORMAT_ABGR8888)
>         && (texture->w % 8) == 0) {
>         renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
>         renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
>@@ -1166,12 +1321,26 @@
>         if (blendMode == SDL_BLENDMODE_NONE) {
>             data->glDisable(GL_BLEND);
>         } else {
>+            SDL_BlendOperation colorOperation = SDL_GetBlendModeColorOperation(blendMode);
>+            SDL_BlendFactor srcColorFactor = SDL_GetBlendModeSrcColorFactor(blendMode);
>+            SDL_BlendFactor dstColorFactor = SDL_GetBlendModeDstColorFactor(blendMode);
>+
>+            if (data->glBlendEquationSeparate_supported) {
>+                SDL_BlendOperation alphaOperation = SDL_GetBlendModeAlphaOperation(blendMode);
>+                data->glBlendEquationSeparate(GetBlendEquation(colorOperation), GetBlendEquation(alphaOperation));
>+            } else if (data->glBlendEquation_supported) {
>+                data->glBlendEquation(GetBlendEquation(colorOperation));
>+            }
>+
>+            if (data->glBlendFuncSeparate_supported) {
>+                SDL_BlendFactor srcAlphaFactor = SDL_GetBlendModeSrcAlphaFactor(blendMode);
>+                SDL_BlendFactor dstAlphaFactor = SDL_GetBlendModeDstAlphaFactor(blendMode);
>+                data->glBlendFuncSeparate(GetBlendFunc(srcColorFactor), GetBlendFunc(dstColorFactor),
>+                                          GetBlendFunc(srcAlphaFactor), GetBlendFunc(dstAlphaFactor));
>+            } else {
>+                data->glBlendFunc(GetBlendFunc(srcColorFactor), GetBlendFunc(dstColorFactor));
>+            }
>             data->glEnable(GL_BLEND);
>-            data->glBlendFuncSeparate(GetBlendFunc(SDL_GetBlendModeSrcColorFactor(blendMode)),
>-                                      GetBlendFunc(SDL_GetBlendModeDstColorFactor(blendMode)),
>-                                      GetBlendFunc(SDL_GetBlendModeSrcAlphaFactor(blendMode)),
>-                                      GetBlendFunc(SDL_GetBlendModeDstAlphaFactor(blendMode)));
>-            data->glBlendEquation(GetBlendEquation(SDL_GetBlendModeColorOperation(blendMode)));
>         }
>         data->current.blendMode = blendMode;
>     }
>@@ -1482,7 +1651,7 @@
>                     Uint32 pixel_format, void * pixels, int pitch)
> {
>     GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
>-    Uint32 temp_format = renderer->target ? renderer->target->format : SDL_PIXELFORMAT_ARGB8888;
>+    Uint32 temp_format = renderer->target ? renderer->target->format : renderer->info.texture_formats[0];
>     void *temp_pixels;
>     int temp_pitch;
>     GLint internalFormat;
>@@ -1586,30 +1755,35 @@
>     if (data) {
>         if (data->context != NULL) {
>             /* make sure we delete the right resources! */
>-            GL_ActivateRenderer(renderer);
>-        }
>-
>-        GL_ClearErrors(renderer);
>-        if (data->GL_ARB_debug_output_supported) {
>-            PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARBFunc = (PFNGLDEBUGMESSAGECALLBACKARBPROC) SDL_GL_GetProcAddress("glDebugMessageCallbackARB");
>+            if (SDL_GL_MakeCurrent(renderer->window, data->context) == 0) {
>+                GL_FBOList *fbo_node = data->framebuffers;
>+                GL_ClearErrors(renderer);
>+                if (data->GL_ARB_debug_output_supported) {
>+                    PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARBFunc = (PFNGLDEBUGMESSAGECALLBACKARBPROC) SDL_GL_GetProcAddress("glDebugMessageCallbackARB");
> 
>-            /* Uh oh, we don't have a safe way of removing ourselves from the callback chain, if it changed after we set our callback. */
>-            /* For now, just always replace the callback with the original one */
>-            glDebugMessageCallbackARBFunc(data->next_error_callback, data->next_error_userparam);
>-        }
>-        if (data->shaders) {
>-            GL_DestroyShaderContext(data->shaders);
>-        }
>-        if (data->context) {
>-            while (data->framebuffers) {
>-                GL_FBOList *nextnode = data->framebuffers->next;
>-                /* delete the framebuffer object */
>-                data->glDeleteFramebuffersEXT(1, &data->framebuffers->FBO);
>-                GL_CheckError("", renderer);
>-                SDL_free(data->framebuffers);
>-                data->framebuffers = nextnode;
>+                    /* Uh oh, we don't have a safe way of removing ourselves from the callback chain, if it changed after we set our callback. */
>+                    /* For now, just always replace the callback with the original one */
>+                    glDebugMessageCallbackARBFunc(data->next_error_callback, data->next_error_userparam);
>+                }
>+                if (data->shaders) {
>+                    GL_DestroyShaderContext(data->shaders);
>+                }
>+                while (fbo_node) {
>+                    /* delete the framebuffer object */
>+                    data->glDeleteFramebuffersEXT(1, &fbo_node->FBO);
>+                    GL_CheckError("", renderer);
>+                    fbo_node = fbo_node->next;
>+                }
>             }
>             SDL_GL_DeleteContext(data->context);
>+        } else {
>+            /* Shader context memory needs to be freed manually in this case. */
>+            SDL_free(data->shaders);
>+        }
>+        while (data->framebuffers) {
>+            /* Free the memory even if the FBOs couldn't be deleted. */
>+            SDL_free(data->framebuffers);
>+            data->framebuffers = data->framebuffers->next;
>         }
>         SDL_free(data);
>     }
>diff -r feab2c8e1bf5 test/testgl2.c
>--- a/test/testgl2.c	Thu Sep 14 21:45:14 2017 +0200
>+++ b/test/testgl2.c	Fri Sep 15 00:31:07 2017 +0200
>@@ -27,7 +27,9 @@
> typedef struct GL_Context
> {
> #define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
>+#define SDL_PROC_TEST(ret,func,params) ret (APIENTRY *func) params;
> #include "../src/render/opengl/SDL_glfuncs.h"
>+#undef SDL_PROC_TEST
> #undef SDL_PROC
> } GL_Context;
>

Actions: View | Diff

Attachments on bug 3830: 2945 | 2950 | 2951 | 2955

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.