pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fixes to the OpenGL renderer

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401966
This commit is contained in:
Sam Lantinga 2006-07-22 18:01:56 +00:00
parent 2fe561616a
commit 46ad1ad5d6
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/video/SDL_renderer_gl.c
View file

@ -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)
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,
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,
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();

2
src/video/win32/SDL_d3drender.c
View file

@ -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,

3
test/common.c
View file

@ -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;