mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGL PS3) Implement our own versions of SetWriteBackEndLabel and SetWaitLabel

Browse Source
This commit is contained in:
twinaphex 2013-04-14 18:20:26 +02:00
parent 3d346ca532
commit 90cd21821f
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ps3/rgl/src/ps3/include/rgl-inline.h
View File

@ -26,6 +26,22 @@ static inline GLuint rglPlatformGetBitsPerPixel (GLenum internalFormat)
#define SUBPIXEL_BITS 12
#define SUBPIXEL_ADJUST (0.5/(1<<SUBPIXEL_BITS))
#define rglGcmSetWriteBackEndLabel(thisContext, index, value) \
(thisContext->current)[0] = (((1) << (18)) | ((0x00001d6c))); \
(thisContext->current)[1] = 0x10 * index; /* offset */ \
(thisContext->current) += 2; \
(thisContext->current)[0] = (((1) << (18)) | ((0x00001d70))); \
(thisContext->current)[1] = ( value & 0xff00ff00) | ((value >> 16) & 0xff) | (((value >> 0 ) & 0xff) << 16); \
(thisContext->current) += 2;
#define rglGcmSetWaitLabel(thisContext, index, value) \
(thisContext->current)[0] = (((1) << (18)) | ((0x00000064))); \
(thisContext->current)[1] = 0x10 * index; \
(thisContext->current) += 2; \
(thisContext->current)[0] = (((1) << (18)) | ((0x00000068))); \
(thisContext->current)[1] = (value); \
(thisContext->current) += 2;
static inline void rglGcmFifoGlViewport(void *data, GLclampf zNear, GLclampf zFar)
{
rglGcmViewportState *vp = (rglGcmViewportState*)data;
@ -273,18 +289,19 @@ inline static void RGLGCM_CALC_COLOR_LE_ARGB8( GLuint *color0, const GLfloat r,
// Utility to let RSX wait for complete RSX pipeline idle
static inline void rglGcmUtilWaitForIdle (void)
{
CellGcmContextData *thisContext = (CellGcmContextData*)gCellGcmCurrentContext;
// set write label command in push buffer, and wait
// NOTE: this is for RSX to wailt
GCM_FUNC( cellGcmSetWriteBackEndLabel, RGLGCM_UTIL_LABEL_INDEX, rglGcmState_i.labelValue );
GCM_FUNC( cellGcmSetWaitLabel, RGLGCM_UTIL_LABEL_INDEX, rglGcmState_i.labelValue );
rglGcmSetWriteBackEndLabel(thisContext, RGLGCM_UTIL_LABEL_INDEX, rglGcmState_i.labelValue );
rglGcmSetWaitLabel(thisContext, RGLGCM_UTIL_LABEL_INDEX, rglGcmState_i.labelValue);
// increment label value for next time.
rglGcmState_i.labelValue++;
// make sure the entire pipe in clear not just the front end
// Utility function that does GPU 'finish'.
GCM_FUNC( cellGcmSetWriteBackEndLabel, RGLGCM_UTIL_LABEL_INDEX,
rglGcmState_i.labelValue );
rglGcmSetWriteBackEndLabel(thisContext, RGLGCM_UTIL_LABEL_INDEX, rglGcmState_i.labelValue );
cellGcmFlush();
while( *(cellGcmGetLabelAddress( RGLGCM_UTIL_LABEL_INDEX)) != rglGcmState_i.labelValue)

7
ps3/rgl/src/ps3/rgl_ps3.cpp
View File

@ -927,6 +927,7 @@ static void gmmFreeBlock (void *data)
static void gmmAddPendingFree (void *data)
{
CellGcmContextData *thisContext = (CellGcmContextData*)gCellGcmCurrentContext;
GmmBlock *pBlock = (GmmBlock*)data;
GmmAllocator *pAllocator;
@ -952,7 +953,7 @@ static void gmmAddPendingFree (void *data)
++nvFenceCounter;
/* semaphore ID : RGLGCM_SEMA_FENCE, new fence value: nvFenceCounter */
GCM_FUNC( cellGcmSetWriteBackEndLabel, RGLGCM_SEMA_FENCE, nvFenceCounter );
rglGcmSetWriteBackEndLabel(thisContext, RGLGCM_SEMA_FENCE, nvFenceCounter );
pBlock->fence = nvFenceCounter;
}
@ -1415,14 +1416,14 @@ static void gmmFreeAll(void)
static void gmmAllocSweep(void *data)
{
CellGcmContextData *thisContext = (CellGcmContextData*)data;
CellGcmContextData *thisContext = (CellGcmContextData*)gCellGcmCurrentContext;
gmmFreeAll();
if (gmmInternalSweep(thisContext))
{
*pLock = 1;
cachedLockValue = 1;
cellGcmSetWriteBackEndLabel(thisContext, GMM_PPU_WAIT_INDEX, 0);
rglGcmSetWriteBackEndLabel(thisContext, GMM_PPU_WAIT_INDEX, 0);
cellGcmFlush(thisContext);
}