sst1: a bit more style cleanup
This commit is contained in:
@@ -428,13 +428,7 @@ GR_ENTRY(grLfbLock, FxBool,( GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t
|
|||||||
#endif
|
#endif
|
||||||
GR_CHECK_SIZE();
|
GR_CHECK_SIZE();
|
||||||
/* We HAVE to idle on Jr., as out-of-order LFBs are unacceptable */
|
/* We HAVE to idle on Jr., as out-of-order LFBs are unacceptable */
|
||||||
if (
|
if (lockIdle || (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96))
|
||||||
lockIdle ||
|
|
||||||
(
|
|
||||||
_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type ==
|
|
||||||
GR_SSTTYPE_SST96
|
|
||||||
)
|
|
||||||
)
|
|
||||||
grSstIdle();
|
grSstIdle();
|
||||||
GR_RETURN( rv );
|
GR_RETURN( rv );
|
||||||
} /* grLfbLock */
|
} /* grLfbLock */
|
||||||
|
|||||||
@@ -836,13 +836,10 @@ GR_ENTRY(grSstWinOpen, FxBool, (
|
|||||||
for (tmu = 0; tmu < gc->num_tmu; tmu += 1)
|
for (tmu = 0; tmu < gc->num_tmu; tmu += 1)
|
||||||
{
|
{
|
||||||
FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD;
|
FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD;
|
||||||
if ( (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type ==
|
if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_VOODOO) &&
|
||||||
GR_SSTTYPE_VOODOO ) &&
|
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == 0)) {
|
||||||
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev ==
|
|
||||||
0 ) )
|
|
||||||
{
|
|
||||||
textureMode = 0;
|
textureMode = 0;
|
||||||
}
|
}
|
||||||
gc->state.tmu_config[tmu].textureMode = textureMode;
|
gc->state.tmu_config[tmu].textureMode = textureMode;
|
||||||
gc->state.tmu_config[tmu].tLOD = 0x00000000;
|
gc->state.tmu_config[tmu].tLOD = 0x00000000;
|
||||||
gc->state.tmu_config[tmu].tDetail = 0x00000000;
|
gc->state.tmu_config[tmu].tDetail = 0x00000000;
|
||||||
|
|||||||
@@ -443,13 +443,7 @@ GR_ENTRY(grLfbLock, FxBool,( GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t
|
|||||||
#endif
|
#endif
|
||||||
GR_CHECK_SIZE();
|
GR_CHECK_SIZE();
|
||||||
/* We HAVE to idle on Jr., as out-of-order LFBs are unacceptable */
|
/* We HAVE to idle on Jr., as out-of-order LFBs are unacceptable */
|
||||||
if (
|
if (lockIdle || (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_SST96))
|
||||||
lockIdle ||
|
|
||||||
(
|
|
||||||
_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type ==
|
|
||||||
GR_SSTTYPE_SST96
|
|
||||||
)
|
|
||||||
)
|
|
||||||
grFinish();
|
grFinish();
|
||||||
GR_RETURN( rv );
|
GR_RETURN( rv );
|
||||||
} /* grLfbLock */
|
} /* grLfbLock */
|
||||||
|
|||||||
@@ -880,13 +880,10 @@ GR_ENTRY(grSstWinOpen, GrContext_t, (FxU32 hWnd,
|
|||||||
for (tmu = 0; tmu < gc->num_tmu; tmu += 1)
|
for (tmu = 0; tmu < gc->num_tmu; tmu += 1)
|
||||||
{
|
{
|
||||||
FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD;
|
FxU32 textureMode = (FxU32)SST_SEQ_8_DOWNLD;
|
||||||
if ( (_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type ==
|
if ((_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].type == GR_SSTTYPE_VOODOO) &&
|
||||||
GR_SSTTYPE_VOODOO ) &&
|
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev == 0)) {
|
||||||
(_GlideRoot.hwConfig.SSTs[_GlideRoot.current_sst].sstBoard.VoodooConfig.tmuConfig[tmu].tmuRev ==
|
|
||||||
0 ) )
|
|
||||||
{
|
|
||||||
textureMode = 0;
|
textureMode = 0;
|
||||||
}
|
}
|
||||||
gc->state.tmu_config[tmu].textureMode = textureMode;
|
gc->state.tmu_config[tmu].textureMode = textureMode;
|
||||||
gc->state.tmu_config[tmu].tLOD = 0x00000000;
|
gc->state.tmu_config[tmu].tLOD = 0x00000000;
|
||||||
gc->state.tmu_config[tmu].tDetail = 0x00000000;
|
gc->state.tmu_config[tmu].tDetail = 0x00000000;
|
||||||
|
|||||||
Reference in New Issue
Block a user