diff --git a/console/rgl/ps3/device_ctx.cpp b/console/rgl/ps3/device_ctx.cpp index cbd08e8c44..34e3b2757e 100644 --- a/console/rgl/ps3/device_ctx.cpp +++ b/console/rgl/ps3/device_ctx.cpp @@ -189,8 +189,6 @@ void _RGLFifoFinish( RGLFifo *fifo ) { if ( !_RGLFifoReferenceInUse( fifo, ref ) ) break; - - sys_timer_usleep( 10 ); } } @@ -225,7 +223,6 @@ static void _RGLFifoInit( RGLFifo *fifo, void *dmaControl, unsigned long dmaPush { if ( _RGLFifoReadReference( fifo ) == 0 ) break; - sys_timer_usleep( 10 ); } } fifo->dmaPushBufferGPU = dmaPushBuffer; @@ -521,7 +518,6 @@ int32_t _RGLOutOfSpaceCallback( struct CellGcmContextData* fifoContext, uint32_t || (get < fifo->dmaPushBufferOffset) || (get > fifo->dmaPushBufferOffset + fifo->dmaPushBufferSizeInWords*sizeof(uint32_t))) { - sys_timer_usleep(30); get = fifo->dmaControl->Get; } @@ -586,7 +582,7 @@ static int _RGLInitRM( RGLResource *gcmResource, unsigned int hostMemorySize, in gcmResource->semaphores = ( RGLSemaphoreMemory * )cellGcmGetLabelAddress( 0 ); gcmResource->dmaControl = ( char* ) cellGcmGetControlRegister() - (( char * ) & (( RGLControlDma* )0 )->Put - ( char * )0 ); - cellGcmFinish( 1 ); + cellGcmFinish(1); gcmResource->hostMemorySize -= dmaPushBufferSize + _RGL_DMA_PUSH_BUFFER_PREFETCH_PADDING; gcmResource->dmaPushBuffer = gcmResource->hostMemoryBase + gcmResource->hostMemorySize; @@ -1294,8 +1290,7 @@ static inline void _RGLUtilWaitForIdle (void) cellGcmSetWriteBackEndLabelInline( &_RGLState.fifo, RGL_UTIL_LABEL_INDEX, _RGLState.labelValue); cellGcmFlush(); - while( *(cellGcmGetLabelAddress( RGL_UTIL_LABEL_INDEX)) != _RGLState.labelValue) - sys_timer_usleep(30); + while( *(cellGcmGetLabelAddress( RGL_UTIL_LABEL_INDEX)) != _RGLState.labelValue); _RGLState.labelValue++; } diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h index 0264488543..72c5570d95 100644 --- a/ps3/sdk_defines.h +++ b/ps3/sdk_defines.h @@ -413,7 +413,6 @@ #define CellVideoOutResolution videoResolution #define CellVideoOutState videoState -#define CellRescPalTemporalMode rescPalTemporalMode #define CellRescInitConfig rescInitConfig #define CellRescSrc rescSrc #define CellRescBufferMode rescBufferMode @@ -422,6 +421,8 @@ #define memoryFrequency memoryFreq #define coreFrequency coreFreq +#define cellGcmFinish rsxFinish + #define cellGcmGetFlipStatus gcmGetFlipStatus #define cellGcmResetFlipStatus gcmResetFlipStatus #define cellGcmSetWaitFlip gcmSetWaitFlip @@ -441,6 +442,11 @@ #define cellGcmSetTileInfo gcmSetTileInfo #define cellGcmAddressToOffset gcmAddressToOffset +#define cellRescCreateInterlaceTable rescCreateInterlaceTable +#define cellRescSetDisplayMode rescSetDisplayMode +#define cellRescGetNumColorBuffers rescGetNumColorBuffers +#define cellRescGetBufferSize rescGetBufferSize +#define cellRescSetBufferAddress rescSetBufferAddress #define cellRescGetFlipStatus rescGetFlipStatus #define cellRescResetFlipStatus rescResetFlipStatus #define cellRescSetConvertAndFlip rescSetConvertAndFlip