Mercurial > sdl-ios-xcode

changeset 3041:20d65430e63c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed OpenGL state issue reported by Dmytro Bogovych
author Sam Lantinga <slouken@libsdl.org>
date Wed, 14 Jan 2009 06:53:03 +0000
parents 62d4992e5a92
children 5475a7b8ddeb
files CREDITS src/video/SDL_renderer_gl.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CREDITS	Wed Jan 14 04:25:32 2009 +0000
+++ b/CREDITS	Wed Jan 14 06:53:03 2009 +0000
@@ -26,8 +26,8 @@
   during the Google Summer of Code 2008
 
 * Marty Leisner, Andrew, Will, Edgar Simo, Donny Viszneki, Andrea Mazzoleni,
-  and Couriersud for helping find SDL 1.3 bugs in the great SDL Bug Hunt
-  of January 2009!
+  Dmytro Bogovych, and Couriersud for helping find SDL 1.3 bugs in the great
+  SDL Bug Hunt of January 2009!
 
 * Donny Viszneki for helping fix SDL 1.3 bugs in the great SDL Bug Hunt of
   January 2009!
--- a/src/video/SDL_renderer_gl.c	Wed Jan 14 04:25:32 2009 +0000
+++ b/src/video/SDL_renderer_gl.c	Wed Jan 14 06:53:03 2009 +0000
@@ -846,6 +846,7 @@
         renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
                                  texture_h, 0, format, type, NULL);
     }
+    renderdata->glDisable(data->type);
     result = renderdata->glGetError();
     if (result != GL_NO_ERROR) {
         GL_SetError("glTexImage2D()", result);
@@ -993,6 +994,7 @@
     renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
                                 rect->h, data->format, data->formattype,
                                 pixels);
+    renderdata->glDisable(data->type);
     result = renderdata->glGetError();
     if (result != GL_NO_ERROR) {
         GL_SetError("glTexSubImage2D()", result);