cleaned win32 alt-tab fix

This commit is contained in:
koolsmoky
2003-09-12 05:06:23 +00:00
parent cedb308d38
commit 5f1285c441
3 changed files with 10 additions and 22 deletions

View File

@@ -3035,14 +3035,6 @@ assertDefaultState( void );
#include <assert.h>
#if WINXP_ALT_TAB_FIX
#define HWCQUERYCONTEXTXP() if (!(gc->windowed || hwcQueryContextXP(gc->bInfo))) return;
#define HWCQUERYCONTEXTXP_RET() if (!(gc->windowed || hwcQueryContextXP(gc->bInfo))) return 0;
#else /* WINXP_ALT_TAB_FIX */
#define HWCQUERYCONTEXTXP()
#define HWCQUERYCONTEXTXP_RET()
#endif/* WINXP_ALT_TAB_FIX */
#ifdef GLIDE_ALT_TAB
#define GR_BEGIN_NOFIFOCHECK(name,level) \
GR_DCL_GC; \
@@ -3051,11 +3043,12 @@ assertDefaultState( void );
FXUNUSED(hw); \
if (!gc) \
return; \
if (gc->lostContext) { \
if (*gc->lostContext) { \
return;\
if (!(gc->windowed)) { \
if (gc->lostContext) { \
if (*gc->lostContext) { \
return;\
}\
}\
HWCQUERYCONTEXTXP(); \
}
#define GR_BEGIN_NOFIFOCHECK_RET(name,level) \
GR_DCL_GC; \
@@ -3064,11 +3057,12 @@ assertDefaultState( void );
FXUNUSED(hw); \
if (!gc) \
return 0; \
if (gc->lostContext) {\
if (*gc->lostContext) { \
return 0;\
if (!(gc->windowed)) { \
if (gc->lostContext) {\
if (*gc->lostContext) { \
return 0;\
}\
}\
HWCQUERYCONTEXTXP_RET(); \
}
#define GR_BEGIN_NOFIFOCHECK_NORET(name,level) \
GR_DCL_GC; \

View File

@@ -1865,7 +1865,6 @@ _GlideInitEnvironment(int which)
_GlideRoot.environment.useAppGamma = GLIDE_GETENV("FX_GLIDE_USE_APP_GAMMA", GC.bInfo->RegPath, 1L);
/* Get CPU Info */
_cpuid (&_GlideRoot.CPUType);

View File

@@ -3346,11 +3346,6 @@ GR_DIENTRY(grSelectContext, FxBool , (GrContext_t context) )
GR_ASSERT((gc >= _GlideRoot.GCs) &&
(gc <= _GlideRoot.GCs + MAX_NUM_SST));
// Need context checking in XP. Should this effect windowed contexts as well??
#if WINXP_ALT_TAB_FIX
hwcQueryContextXP(gc->bInfo);
#endif
#ifdef GLIDE_INIT_HWC
gc->contextP = !(*gc->lostContext) ;
#else