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

Scaler flags housekeeping

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1930 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-10-26 07:30:38 +00:00
parent 95f9ce0df7
commit 3aedeadc93
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/opengl.c
+4 -13
View File
@@ -122,9 +122,7 @@ TFB_GL_ConfigureVideo (int driver, int flags, int width, int height, int bpp)
glGetString (GL_RENDERER), glGetString (GL_VERSION)); glGetString (GL_RENDERER), glGetString (GL_VERSION));
} }
if (GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPT || if (GfxFlags & TFB_GFXFLAGS_SCALE_SOFT_ONLY)
GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPTADV ||
GfxFlags & TFB_GFXFLAGS_SCALE_TRISCAN)
{ {
if (scaled_display) if (scaled_display)
{ {
@@ -173,10 +171,7 @@ TFB_GL_ConfigureVideo (int driver, int flags, int width, int height, int bpp)
return -1; return -1;
} }
if (GfxFlags & TFB_GFXFLAGS_SCALE_BILINEAR || if (GfxFlags & TFB_GFXFLAGS_SCALE_ANY)
GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPT ||
GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPTADV ||
GfxFlags & TFB_GFXFLAGS_SCALE_TRISCAN)
ScreenFilterMode = GL_LINEAR; ScreenFilterMode = GL_LINEAR;
else else
ScreenFilterMode = GL_NEAREST; ScreenFilterMode = GL_NEAREST;
@@ -327,9 +322,7 @@ TFB_GL_SwapBuffers (int force_full_redraw)
updated.w = TFB_BBox.region.extent.width; updated.w = TFB_BBox.region.extent.width;
updated.h = TFB_BBox.region.extent.height; updated.h = TFB_BBox.region.extent.height;
if (GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPT || if (GfxFlags & TFB_GFXFLAGS_SCALE_SOFT_ONLY)
GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPTADV ||
GfxFlags & TFB_GFXFLAGS_SCALE_TRISCAN)
{ {
if (GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPT) if (GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPT)
Scale_BiAdaptFilter (SDL_Screen, scaled_display, &updated); Scale_BiAdaptFilter (SDL_Screen, scaled_display, &updated);
@@ -369,9 +362,7 @@ TFB_GL_SwapBuffers (int force_full_redraw)
if (upload_transitiontexture) if (upload_transitiontexture)
{ {
if (GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPT || if (GfxFlags & TFB_GFXFLAGS_SCALE_SOFT_ONLY)
GfxFlags & TFB_GFXFLAGS_SCALE_BIADAPTADV ||
GfxFlags & TFB_GFXFLAGS_SCALE_TRISCAN)
{ {
SDL_Rect r; SDL_Rect r;
r.x = r.y = 0; r.x = r.y = 0;