From 46ad1ad5d693f4dfa94cf12f8e288ddd80dbcd3a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 22 Jul 2006 18:01:56 +0000 Subject: [PATCH] Bug fixes to the OpenGL renderer --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401966 --- src/video/SDL_renderer_gl.c | 7 +++---- src/video/win32/SDL_d3drender.c | 2 +- test/common.c | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/video/SDL_renderer_gl.c b/src/video/SDL_renderer_gl.c index 1dfc8f021..e5b9ac465 100644 --- a/src/video/SDL_renderer_gl.c +++ b/src/video/SDL_renderer_gl.c @@ -70,7 +70,7 @@ SDL_RenderDriver GL_RenderDriver = { SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add | SDL_TextureBlendMode_Mod), (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast | - SDL_TextureScaleMode_Best), + SDL_TextureScaleMode_Slow), 18, { SDL_PixelFormat_Index1LSB, @@ -285,7 +285,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) break; case SDL_PixelFormat_RGBA8888: internalFormat = GL_RGBA8; - format = GL_BGRA; + format = GL_RGBA; type = GL_UNSIGNED_INT_8_8_8_8; break; case SDL_PixelFormat_ABGR8888: @@ -502,7 +502,6 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER, GL_NEAREST); break; case SDL_TextureScaleMode_Slow: - case SDL_TextureScaleMode_Best: glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER, GL_LINEAR); break; @@ -514,7 +513,7 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, glTexCoord2f(maxu, minv); glVertex2i(maxx, miny); glTexCoord2f(minu, maxv); - glVertex2i(miny, maxy); + glVertex2i(minx, maxy); glTexCoord2f(maxu, maxv); glVertex2i(maxx, maxy); glEnd(); diff --git a/src/video/win32/SDL_d3drender.c b/src/video/win32/SDL_d3drender.c index 777310f37..0808dd767 100644 --- a/src/video/win32/SDL_d3drender.c +++ b/src/video/win32/SDL_d3drender.c @@ -68,7 +68,7 @@ SDL_RenderDriver D3D_RenderDriver = { SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add | SDL_TextureBlendMode_Mod), (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast | - SDL_TextureScaleMode_Best), + SDL_TextureScaleMode_Slow | SDL_TextureScaleMode_Best), 12, { SDL_PixelFormat_Index8, diff --git a/test/common.c b/test/common.c index 1fb15e57d..4baa5a440 100644 --- a/test/common.c +++ b/test/common.c @@ -304,6 +304,9 @@ PrintRendererFlag(Uint32 flag) case SDL_Renderer_PresentVSync: fprintf(stderr, "PresentVSync"); break; + case SDL_Renderer_Accelerated: + fprintf(stderr, "Accelerated"); + break; default: fprintf(stderr, "0x%8.8x", flag); break;