Commit 46ad1ad5 authored by Sam Lantinga's avatar Sam Lantinga

Bug fixes to the OpenGL renderer

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401966
parent 2fe56161
...@@ -70,7 +70,7 @@ SDL_RenderDriver GL_RenderDriver = { ...@@ -70,7 +70,7 @@ SDL_RenderDriver GL_RenderDriver = {
SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add | SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add |
SDL_TextureBlendMode_Mod), SDL_TextureBlendMode_Mod),
(SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast | (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast |
SDL_TextureScaleMode_Best), SDL_TextureScaleMode_Slow),
18, 18,
{ {
SDL_PixelFormat_Index1LSB, SDL_PixelFormat_Index1LSB,
...@@ -285,7 +285,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ...@@ -285,7 +285,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
break; break;
case SDL_PixelFormat_RGBA8888: case SDL_PixelFormat_RGBA8888:
internalFormat = GL_RGBA8; internalFormat = GL_RGBA8;
format = GL_BGRA; format = GL_RGBA;
type = GL_UNSIGNED_INT_8_8_8_8; type = GL_UNSIGNED_INT_8_8_8_8;
break; break;
case SDL_PixelFormat_ABGR8888: case SDL_PixelFormat_ABGR8888:
...@@ -502,7 +502,6 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -502,7 +502,6 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
break; break;
case SDL_TextureScaleMode_Slow: case SDL_TextureScaleMode_Slow:
case SDL_TextureScaleMode_Best:
glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
break; break;
...@@ -514,7 +513,7 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -514,7 +513,7 @@ GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
glTexCoord2f(maxu, minv); glTexCoord2f(maxu, minv);
glVertex2i(maxx, miny); glVertex2i(maxx, miny);
glTexCoord2f(minu, maxv); glTexCoord2f(minu, maxv);
glVertex2i(miny, maxy); glVertex2i(minx, maxy);
glTexCoord2f(maxu, maxv); glTexCoord2f(maxu, maxv);
glVertex2i(maxx, maxy); glVertex2i(maxx, maxy);
glEnd(); glEnd();
......
...@@ -68,7 +68,7 @@ SDL_RenderDriver D3D_RenderDriver = { ...@@ -68,7 +68,7 @@ SDL_RenderDriver D3D_RenderDriver = {
SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add | SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add |
SDL_TextureBlendMode_Mod), SDL_TextureBlendMode_Mod),
(SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast | (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast |
SDL_TextureScaleMode_Best), SDL_TextureScaleMode_Slow | SDL_TextureScaleMode_Best),
12, 12,
{ {
SDL_PixelFormat_Index8, SDL_PixelFormat_Index8,
......
...@@ -304,6 +304,9 @@ PrintRendererFlag(Uint32 flag) ...@@ -304,6 +304,9 @@ PrintRendererFlag(Uint32 flag)
case SDL_Renderer_PresentVSync: case SDL_Renderer_PresentVSync:
fprintf(stderr, "PresentVSync"); fprintf(stderr, "PresentVSync");
break; break;
case SDL_Renderer_Accelerated:
fprintf(stderr, "Accelerated");
break;
default: default:
fprintf(stderr, "0x%8.8x", flag); fprintf(stderr, "0x%8.8x", flag);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment