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

Dead batching flags removed

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3404 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-12-08 17:01:38 +00:00
parent 3c63c20371
commit 2e3dfee3cd
3 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/gfxlib.h
+1 -2
View File
@@ -195,9 +195,8 @@ typedef STRINGPTR COLORMAPPTR;
#include "graphics/prim.h" #include "graphics/prim.h"
typedef BYTE BATCH_FLAGS; typedef BYTE BATCH_FLAGS;
// This flag is currently unused but it might make sense to restore it
#define BATCH_BUILD_PAGE (BATCH_FLAGS)(1 << 0) #define BATCH_BUILD_PAGE (BATCH_FLAGS)(1 << 0)
#define BATCH_SINGLE (BATCH_FLAGS)(1 << 1)
typedef struct typedef struct
{ {
sc2/src/libs/graphics/context.h
-11
View File
@@ -110,17 +110,6 @@ extern PRIMITIVE _locPrim;
SetContextFBkFlags (FBK_DIRTY); \ SetContextFBkFlags (FBK_DIRTY); \
} }
/*
These seem to have been moved to gfxlib.h, but not in their
entirety. That's rather unpleasant. -- Michael
#define BATCH_BUILD_PAGE (BATCH_FLAGS)(1 << 0)
#define BATCH_SINGLE (BATCH_FLAGS)(1 << 1)
#define BATCH_UPDATE_DRAWABLE (BATCH_FLAGS)(1 << 2)
*/
#define BATCH_CLIP_GRAPHICS (BATCH_FLAGS)(1 << 3)
#define BATCH_XFORM (BATCH_FLAGS)(1 << 4)
typedef BYTE GRAPHICS_STATUS; typedef BYTE GRAPHICS_STATUS;
extern GRAPHICS_STATUS _GraphicsStatusFlags; extern GRAPHICS_STATUS _GraphicsStatusFlags;
sc2/src/libs/graphics/frame.c
-19
View File
@@ -108,8 +108,6 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
PRIM_LINKS OldLinks; PRIM_LINKS OldLinks;
PRIMITIVE *lpPrim; PRIMITIVE *lpPrim;
BatchFlags &= BATCH_SINGLE | BATCH_BUILD_PAGE | BATCH_XFORM;
BatchGraphics (); BatchGraphics ();
if (BatchFlags & BATCH_BUILD_PAGE) if (BatchFlags & BATCH_BUILD_PAGE)
@@ -119,19 +117,6 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
CurIndex = GetPredLink (PrimLinks); CurIndex = GetPredLink (PrimLinks);
if (BatchFlags & BATCH_SINGLE)
{
if (CurIndex == END_OF_LIST)
BatchFlags &= ~BATCH_SINGLE;
else
{
lpBasePrim += CurIndex;
OldLinks = GetPrimLinks (lpBasePrim);
SetPrimLinks (lpBasePrim, END_OF_LIST, END_OF_LIST);
CurIndex = 0;
}
}
for (; CurIndex != END_OF_LIST; for (; CurIndex != END_OF_LIST;
CurIndex = GetSuccLink (GetPrimLinks (lpPrim))) CurIndex = GetSuccLink (GetPrimLinks (lpPrim)))
{ {
@@ -183,10 +168,6 @@ DrawBatch (PRIMITIVE *lpBasePrim, PRIM_LINKS PrimLinks,
} }
UnbatchGraphics (); UnbatchGraphics ();
if (BatchFlags & BATCH_SINGLE)
SetPrimLinks (lpBasePrim,
GetPredLink (OldLinks), GetSuccLink (OldLinks));
} }
} }