diff --git a/glide2x/sst1/glide/src/glfb.c b/glide2x/sst1/glide/src/glfb.c index 77aadeb..5a38fc1 100644 --- a/glide2x/sst1/glide/src/glfb.c +++ b/glide2x/sst1/glide/src/glfb.c @@ -428,13 +428,7 @@ GR_ENTRY(grLfbLock, FxBool,( GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t #endif GR_CHECK_SIZE(); /* We HAVE to idle on Jr., as out-of-order LFBs are unacceptable */ - if ( - lockIdle || - ( - _GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == - GR_SSTTYPE_SST96 - ) - ) + if (lockIdle || (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96)) grSstIdle(); GR_RETURN( rv ); } /* grLfbLock */ diff --git a/glide2x/sst1/glide/src/gsst.c b/glide2x/sst1/glide/src/gsst.c index 4583f85..2a2ee1f 100644 --- a/glide2x/sst1/glide/src/gsst.c +++ b/glide2x/sst1/glide/src/gsst.c @@ -836,13 +836,10 @@ GR_ENTRY(grSstWinOpen, FxBool, ( for (tmu = 0; tmu < gc->num_tmu; tmu += 1) { FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD; - if ( (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == - GR_SSTTYPE_VOODOO ) && - (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == - 0 ) ) - { + if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_VOODOO) && + (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == 0)) { textureMode = 0; - } + } gc->state.tmu_config[tmu].textureMode = textureMode; gc->state.tmu_config[tmu].tLOD = 0x00000000; gc->state.tmu_config[tmu].tDetail = 0x00000000; diff --git a/glide3x/sst1/glide3/src/glfb.c b/glide3x/sst1/glide3/src/glfb.c index 1a4c367..0499aab 100644 --- a/glide3x/sst1/glide3/src/glfb.c +++ b/glide3x/sst1/glide3/src/glfb.c @@ -443,13 +443,7 @@ GR_ENTRY(grLfbLock, FxBool,( GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t #endif GR_CHECK_SIZE(); /* We HAVE to idle on Jr., as out-of-order LFBs are unacceptable */ - if ( - lockIdle || - ( - _GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == - GR_SSTTYPE_SST96 - ) - ) + if (lockIdle || (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96)) grFinish(); GR_RETURN( rv ); } /* grLfbLock */ diff --git a/glide3x/sst1/glide3/src/gsst.c b/glide3x/sst1/glide3/src/gsst.c index 9cc4448..6d6e04c 100644 --- a/glide3x/sst1/glide3/src/gsst.c +++ b/glide3x/sst1/glide3/src/gsst.c @@ -880,13 +880,10 @@ GR_ENTRY(grSstWinOpen, GrContext_t, (FxU32 hWnd, for (tmu = 0; tmu < gc->num_tmu; tmu += 1) { FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD; - if ( (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == - GR_SSTTYPE_VOODOO ) && - (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == - 0 ) ) - { + if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_VOODOO) && + (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == 0)) { textureMode = 0; - } + } gc->state.tmu_config[tmu].textureMode = textureMode; gc->state.tmu_config[tmu].tLOD = 0x00000000; gc->state.tmu_config[tmu].tDetail = 0x00000000;