adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crosshair in orbit leaving light trace to image in OpenGL mode fixed

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@474 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-23 19:59:47 +00:00
parent 3252591a76
commit 36ec73ebb5
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/opengl.c
+7 -13
View File
@@ -124,7 +124,7 @@ TFB_GL_InitGraphics (int driver, int flags, int width, int height, int bpp)
glGetString (GL_RENDERER), glGetString (GL_VERSION)); glGetString (GL_RENDERER), glGetString (GL_VERSION));
} }
SDL_Screen = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 24, SDL_Screen = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 32,
R_MASK, G_MASK, B_MASK, 0x00000000); R_MASK, G_MASK, B_MASK, 0x00000000);
if (SDL_Screen == NULL) if (SDL_Screen == NULL)
@@ -133,7 +133,7 @@ TFB_GL_InitGraphics (int driver, int flags, int width, int height, int bpp)
exit (-1); exit (-1);
} }
ExtraScreen = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 24, ExtraScreen = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 32,
R_MASK, G_MASK, B_MASK, 0x00000000); R_MASK, G_MASK, B_MASK, 0x00000000);
if (ExtraScreen == NULL) if (ExtraScreen == NULL)
@@ -142,7 +142,7 @@ TFB_GL_InitGraphics (int driver, int flags, int width, int height, int bpp)
exit (-1); exit (-1);
} }
TransitionScreen = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 24, TransitionScreen = SDL_CreateRGBSurface(SDL_SWSURFACE, ScreenWidth, ScreenHeight, 32,
R_MASK, G_MASK, B_MASK, 0x00000000); R_MASK, G_MASK, B_MASK, 0x00000000);
if (TransitionScreen == NULL) if (TransitionScreen == NULL)
@@ -160,12 +160,6 @@ TFB_GL_InitGraphics (int driver, int flags, int width, int height, int bpp)
exit(-1); exit(-1);
} }
if ((GfxFlags & TFB_GFXFLAGS_SCALE_SAI) || (GfxFlags & TFB_GFXFLAGS_SCALE_SUPERSAI))
{
GfxFlags &= ~(TFB_GFXFLAGS_SCALE_SAI|TFB_GFXFLAGS_SCALE_SUPERSAI);
GfxFlags |= TFB_GFXFLAGS_SCALE_BILINEAR;
}
if (GfxFlags & TFB_GFXFLAGS_SCALE_BILINEAR) if (GfxFlags & TFB_GFXFLAGS_SCALE_BILINEAR)
ScreenFilterMode = GL_LINEAR; ScreenFilterMode = GL_LINEAR;
else else
@@ -189,14 +183,14 @@ TFB_GL_InitGraphics (int driver, int flags, int width, int height, int bpp)
glPixelStorei (GL_UNPACK_ALIGNMENT, 1); glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB, 512, 256, 0, GL_RGB, GL_UNSIGNED_BYTE, 0); glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB, 512, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
glGenTextures (1, &TransitionTexture); glGenTextures (1, &TransitionTexture);
glBindTexture (GL_TEXTURE_2D, TransitionTexture); glBindTexture (GL_TEXTURE_2D, TransitionTexture);
glPixelStorei (GL_UNPACK_ALIGNMENT, 1); glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB, 512, 256, 0, GL_RGB, GL_UNSIGNED_BYTE, 0); glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB, 512, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
return 0; return 0;
} }
@@ -280,7 +274,7 @@ TFB_GL_SwapBuffers (void)
SDL_LockSurface (SDL_Screen); SDL_LockSurface (SDL_Screen);
glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, ScreenWidth, ScreenHeight, glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, ScreenWidth, ScreenHeight,
GL_RGB, GL_UNSIGNED_BYTE, SDL_Screen->pixels); GL_RGBA, GL_UNSIGNED_BYTE, SDL_Screen->pixels);
SDL_UnlockSurface (SDL_Screen); SDL_UnlockSurface (SDL_Screen);
TFB_GL_DrawQuad (); TFB_GL_DrawQuad ();
@@ -297,7 +291,7 @@ TFB_GL_SwapBuffers (void)
{ {
SDL_LockSurface (TransitionScreen); SDL_LockSurface (TransitionScreen);
glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, ScreenWidth, ScreenHeight, glTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, ScreenWidth, ScreenHeight,
GL_RGB, GL_UNSIGNED_BYTE, TransitionScreen->pixels); GL_RGBA, GL_UNSIGNED_BYTE, TransitionScreen->pixels);
SDL_UnlockSurface (TransitionScreen); SDL_UnlockSurface (TransitionScreen);
upload_transitiontexture = FALSE; upload_transitiontexture = FALSE;