CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-26 21:36:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(RGL PS3) Turn rglGcmFifo into a struct instead of a C++-style struct

Browse Source 
(ie. class)
This commit is contained in:
twinaphex 2013-11-16 17:47:46 +01:00
parent 28e9ce7d30
commit 5c89e9106a
6 changed files with 45 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ps3/rgl/src/ps3/include/GmmAlloc.h
View File

@ -108,12 +108,6 @@ typedef struct GmmAllocator
uint32_t totalSize; // == size + tileSize
} GmmAllocator;
uint32_t gmmInit(
const void *localMemoryBase,
const void *localStartAddress,
const uint32_t localSize
);
uint32_t gmmDestroy(void);
char *gmmIdToAddress(const uint32_t id);
uint32_t gmmFree (const uint32_t freeId);

2
ps3/rgl/src/ps3/include/rgl-constants.h
View File

@ -253,7 +253,7 @@ typedef enum rglGcmEnum
// 253 used in RGLGcmFifoUtils.h
#define RGLGCM_SEMA_NEVENTS 128
#define RGLGCM_SEMA_BASE 64 // libgcm uses 0-63
#define RGLGCM_SEMA_FENCE (RGLGCM_SEMA_BASE+RGLGCM_SEMA_NEVENTS+0)
#define RGLGCM_SEMA_FENCE 192
// synchronization
// rglGcmSync enables GPU waiting by sending nv_glAcquireSemaphore to the

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

@ -241,10 +241,10 @@ static inline GLuint rglPlatformGetBitsPerPixel (GLenum internalFormat)
#define rglGcmFifoReadReference(fifo) (fifo->lastHWReferenceRead = *((volatile GLuint *)&fifo->dmaControl->Reference))
#define rglGcmFifoFlush(fifo, offsetInBytes) \
cellGcmAddressToOffset( fifo->current, ( uint32_t * )&offsetInBytes ); \
cellGcmAddressToOffset( fifo->ctx.current, ( uint32_t * )&offsetInBytes ); \
cellGcmFlush(); \
fifo->dmaControl->Put = offsetInBytes; \
fifo->lastPutWritten = fifo->current; \
fifo->lastPutWritten = fifo->ctx.current; \
fifo->lastSWReferenceFlushed = fifo->lastSWReferenceWritten;
#define rglGcmSetSurface(thisContext, surface, origin, pixelCenter, log2Width, log2Height) \
@ -777,7 +777,7 @@ static inline void rglPrintIt (unsigned int v)
static inline void rglPrintFifoFromPut( unsigned int numWords )
{
for ( int i = -numWords; i <= -1; i++ )
rglPrintIt((( uint32_t* )rglGcmState_i.fifo.current )[i] );
rglPrintIt((( uint32_t* )rglGcmState_i.fifo.ctx.current )[i] );
}
// prints the last numWords of the command fifo

61
ps3/rgl/src/ps3/include/rgl-typedefs.h
View File

@ -215,9 +215,17 @@ typedef volatile struct
GLuint Ignored03[0x7e4];
} rglGcmControlDma;
// _only_ update lastGetRead if the Get is in our pushbuffer
#define fifoUpdateGetLastRead(fifo) \
uint32_t* tmp = (uint32_t*)(( char* )fifo->dmaPushBufferBegin - fifo->dmaPushBufferOffset + ( *(( volatile GLuint* )&fifo->dmaControl->Get))); \
if ((tmp >= fifo->ctx.begin) && (tmp <= fifo->ctx.end)) \
fifo->lastGetRead = tmp;
// all fifo related data is kept here
struct rglGcmFifo: public CellGcmContextData
struct rglGcmFifo
{
CellGcmContextData ctx;
// dmaControl for allocated channel
rglGcmControlDma *dmaControl;
@ -251,51 +259,8 @@ struct rglGcmFifo: public CellGcmContextData
GLuint lastHWReferenceRead;
uint32_t *dmaPushBufferGPU;
int spuid;
public:
inline void updateLastGetRead()
{
uint32_t* tmp = (uint32_t*)(( char* )dmaPushBufferBegin - dmaPushBufferOffset + ( *(( volatile GLuint* ) & dmaControl->Get ) ) );
// _only_ update lastGetRead if the Get is in our pushbuffer
if (( tmp >= begin ) && ( tmp <= end ) ) lastGetRead = tmp;
}
};
typedef volatile struct
{
struct
{
GLuint nanoseconds[2]; /* nanoseconds since Jan. 1, 1970 0- 7*/
}
timeStamp; /* -0007*/
GLuint value; /* info returned depends on method 0008-000b*/
GLuint zero; /* always written to zero 000c-000f*/
}
rglGcmGetReport;
/* memory data structures */
typedef volatile struct
{
struct
{ /* 0000- */
GLuint nanoseconds[2]; /* nanoseconds since Jan. 1, 1970 0- 7*/
}
timeStamp; /* -0007*/
GLuint info32; /* info returned depends on method 0008-000b*/
GLushort info16; /* info returned depends on method 000c-000d*/
GLushort status; /* user sets bit 15, NV sets status 000e-000f*/
}
rglGcmNotification;
// notifiers in host memory
struct rglGcmHostNotifierMemory
{
// signals channel errors
rglGcmNotification channelDmaError[2];
};
// 16 byte aligned semaphores
struct rglGcmSemaphore
{
@ -326,7 +291,6 @@ struct rglGcmResource
// host memory window the gpu can access
char * hostMemoryBase;
GLuint hostMemorySize;
GLuint hostMemoryReserved;
// offset of dmaPushBuffer relative to its DMA CONTEXT
unsigned long dmaPushBufferOffset;
@ -334,9 +298,6 @@ struct rglGcmResource
GLuint dmaPushBufferSize;
void* dmaControl;
// all kind of notifers
rglGcmHostNotifierMemory *hostNotifierBuffer;
// semaphores
rglGcmSemaphoreMemory *semaphores;
};
@ -460,10 +421,6 @@ struct rglGcmState
void *hostMemoryBase;
GLuint hostMemorySize;
// all kind of notifers
rglGcmHostNotifierMemory *hostNotifierBuffer;
// semaphores
rglGcmSemaphoreMemory *semaphores;

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

@ -440,11 +440,8 @@ static void gmmDestroyFixedAllocator (void)
#define GMM_ALLOC_FIXED_BLOCK() ((GmmBlock*)gmmAllocFixed(0))
uint32_t gmmInit(
const void *localMemoryBase,
const void *localStartAddress,
const uint32_t localSize
)
static uint32_t gmmInit(const void *localMemoryBase, const void *localStartAddress,
const uint32_t localSize)
{
GmmAllocator *pAllocator;
uint32_t alignedLocalSize, alignedMainSize;
@ -1528,12 +1525,12 @@ void rglGcmFifoInit (void *data, void *dmaControl, unsigned long dmaPushBufferOf
fifo->fifoBlockSize = DEFAULT_FIFO_BLOCK_SIZE;
// init fifo context pointers to first fifo block which will be set at the the dmaPushPuffer position
fifo->begin = (uint32_t*) dmaPushBuffer;
fifo->end = fifo->begin + ( fifo->fifoBlockSize / sizeof( uint32_t ) ) - 1;
fifo->ctx.begin = (uint32_t*) dmaPushBuffer;
fifo->ctx.end = fifo->ctx.begin + ( fifo->fifoBlockSize / sizeof( uint32_t ) ) - 1;
// init rest of context
fifo->current = fifo->begin;
fifo->lastGetRead = fifo->current;
fifo->lastPutWritten = fifo->current;
fifo->ctx.current = fifo->ctx.begin;
fifo->lastGetRead = fifo->ctx.current;
fifo->lastPutWritten = fifo->ctx.current;
// store fifo values
fifo->dmaPushBufferBegin = dmaPushBuffer;
@ -1546,8 +1543,7 @@ void rglGcmFifoInit (void *data, void *dmaControl, unsigned long dmaPushBufferOf
fifo->lastSWReferenceWritten = 0;
fifo->lastSWReferenceFlushed = 0;
// note that rglGcmFifo is-a CellGcmContextData
gCellGcmCurrentContext = fifo;
gCellGcmCurrentContext = &fifo->ctx;
// setting our own out of space callback here to handle our fifo
gCellGcmCurrentContext->callback = ( CellGcmContextCallback )rglOutOfSpaceCallback;
@ -1585,7 +1581,6 @@ GLboolean rglGcmInitFromRM( rglGcmResource *rmResource )
rglGcmSt->hostMemoryBase = rmResource->hostMemoryBase;
rglGcmSt->hostMemorySize = rmResource->hostMemorySize;
rglGcmSt->hostNotifierBuffer = NULL; //rmResource->hostNotifierBuffer;
rglGcmSt->semaphores = rmResource->semaphores;
rglGcmFifoInit( &rglGcmSt->fifo, rmResource->dmaControl, rmResource->dmaPushBufferOffset, (uint32_t*)rmResource->dmaPushBuffer, rmResource->dmaPushBufferSize );
@ -1927,12 +1922,12 @@ int32_t rglOutOfSpaceCallback (void *data, uint32_t spaceInWords)
uint32_t *nextbegin, *nextend, nextbeginoffset, nextendoffset;
fifo->updateLastGetRead();
fifoUpdateGetLastRead(fifo);
// If the current end isn't the same as the full fifo end we
// aren't at the end. Just go ahead and set the next begin and end
if(fifo->end != fifo->dmaPushBufferEnd)
nextbegin = (uint32_t *)fifo->end + 1;
if(fifo->ctx.end != fifo->dmaPushBufferEnd)
nextbegin = (uint32_t *)fifo->ctx.end + 1;
else
nextbegin = (uint32_t *)fifo->dmaPushBufferBegin;
nextend = nextbegin + (fifo->fifoBlockSize)/sizeof(uint32_t) - 1;
@ -1943,11 +1938,10 @@ int32_t rglOutOfSpaceCallback (void *data, uint32_t spaceInWords)
//use this version so as not to trigger another callback
cellGcmSetJumpCommandUnsafeInline((CellGcmContextData*)fifo, nextbeginoffset);
//set up new context
fifo->begin = nextbegin;
fifo->current = nextbegin;
fifo->end = nextend;
fifo->ctx.begin = nextbegin;
fifo->ctx.current = nextbegin;
fifo->ctx.end = nextend;
//if Gpu busy with the new area, stall and flush
uint32_t get = fifo->dmaControl->Get;
@ -1974,8 +1968,8 @@ int32_t rglOutOfSpaceCallback (void *data, uint32_t spaceInWords)
// same position when the fifo is in GPU memory.
for ( GLuint i = 0; i < 8; i++ )
{
fifo->current[0] = 0;
fifo->current++;
fifo->ctx.current[0] = 0;
fifo->ctx.current++;
}
return CELL_OK;
@ -1987,11 +1981,9 @@ void rglGcmDestroyRM( rglGcmResource* gcmResource )
free( gcmResource->hostMemoryBase );
memset(( void* )gcmResource, 0, sizeof( rglGcmResource ) );
return;
}
int rglGcmInitRM( rglGcmResource *gcmResource, unsigned int hostMemorySize, int inSysMem, unsigned int dmaPushBufferSize )
static int rglGcmInitRM( rglGcmResource *gcmResource, int inSysMem, unsigned int dmaPushBufferSize )
{
memset( gcmResource, 0, sizeof( rglGcmResource ) );
@ -2002,7 +1994,7 @@ int rglGcmInitRM( rglGcmResource *gcmResource, unsigned int hostMemorySize, int
// in case of host push buffer we need to add padding to avoid GPU push buffer prefetch to
// cause a problem fetching invalid addresses at the end of the push buffer.
gcmResource->hostMemorySize = rglPad( RGLGCM_FIFO_SIZE + hostMemorySize + dmaPushBufferSize + RGLGCM_DMA_PUSH_BUFFER_PREFETCH_PADDING + (RGLGCM_LM_MAX_TOTAL_QUERIES * sizeof( GLuint )), 1 << 20 );
gcmResource->hostMemorySize = rglPad( RGLGCM_FIFO_SIZE + dmaPushBufferSize + RGLGCM_DMA_PUSH_BUFFER_PREFETCH_PADDING + (RGLGCM_LM_MAX_TOTAL_QUERIES * sizeof( GLuint )), 1 << 20 );
if ( gcmResource->hostMemorySize > 0 )
gcmResource->hostMemoryBase = (char *)memalign( 1 << 20, gcmResource->hostMemorySize );
@ -2026,32 +2018,19 @@ int rglGcmInitRM( rglGcmResource *gcmResource, unsigned int hostMemorySize, int
gcmResource->semaphores = ( rglGcmSemaphoreMemory * )cellGcmGetLabelAddress( 0 );
gcmResource->dmaControl = ( char* ) cellGcmGetControlRegister() - (( char * ) & (( rglGcmControlDma* )0 )->Put - ( char * )0 );
int hostPushBuffer = 0;
hostPushBuffer = 1;
// the IOIF mapping don't work. work-around here.
for ( GLuint i = 0;i < 32;++i ) gcmResource->ioifMappings[i] = ( unsigned long long )( unsigned long )( gcmResource->localAddress + ( 64 << 20 ) * ( i / 4 ) );
for (GLuint i = 0; i < 32; ++i)
gcmResource->ioifMappings[i] = ( unsigned long long )( unsigned long )( gcmResource->localAddress + ( 64 << 20 ) * ( i / 4 ) );
cellGcmFinish( 1 ); // added just a constant value for now to adjust to the inline libgcm interface change
cellGcmFinish(1); // added just a constant value for now to adjust to the inline libgcm interface change
if ( hostPushBuffer )
{
gcmResource->hostMemorySize -= dmaPushBufferSize + RGLGCM_DMA_PUSH_BUFFER_PREFETCH_PADDING;
gcmResource->dmaPushBuffer = gcmResource->hostMemoryBase + gcmResource->hostMemorySize;
gcmResource->dmaPushBufferOffset = ( char * )gcmResource->dmaPushBuffer - ( char * )gcmResource->hostMemoryBase;
gcmResource->linearMemory = ( char* )0x0;
gcmResource->persistentMemorySize = gcmResource->localSize;
}
else
{
// Allocate Fifo at begining of vmem map
gcmResource->dmaPushBuffer = gcmResource->localAddress;
gcmResource->dmaPushBufferOffset = ( char * )gcmResource->dmaPushBuffer - ( char * )gcmResource->localAddress;
gcmResource->linearMemory = ( char* )0x0 + dmaPushBufferSize;
gcmResource->persistentMemorySize = gcmResource->localSize - dmaPushBufferSize;
}
gcmResource->hostMemorySize -= dmaPushBufferSize + RGLGCM_DMA_PUSH_BUFFER_PREFETCH_PADDING;
gcmResource->dmaPushBuffer = gcmResource->hostMemoryBase + gcmResource->hostMemorySize;
gcmResource->dmaPushBufferOffset = ( char * )gcmResource->dmaPushBuffer - ( char * )gcmResource->hostMemoryBase;
gcmResource->linearMemory = ( char* )0x0;
gcmResource->persistentMemorySize = gcmResource->localSize;
gcmResource->dmaPushBufferSize = dmaPushBufferSize;
gcmResource->hostMemoryReserved = RGLGCM_FIFO_SIZE;
// Set Jump command to our fifo structure
cellGcmSetJumpCommand(( char * )gcmResource->dmaPushBuffer - ( char * )gcmResource->hostMemoryBase );
@ -2110,17 +2089,14 @@ GLboolean rglPlatformDeviceInit (void *data)
{
RGLinitOptions *options = (RGLinitOptions*)data;
GLuint fifoSize = RGLGCM_FIFO_SIZE_DEFAULT;
GLuint hostSize = RGLGCM_HOST_SIZE_DEFAULT;
if ( options != NULL )
{
if ( options->enable & RGL_INIT_FIFO_SIZE )
fifoSize = options->fifoSize;
if ( options->enable & RGL_INIT_HOST_MEMORY_SIZE )
hostSize = options->hostMemorySize;
}
if ( !rglGcmInitRM( &rglGcmResource, hostSize, 0, fifoSize ) )
if ( !rglGcmInitRM( &rglGcmResource, 0, fifoSize ) )
{
fprintf( stderr, "RM resource failed initialisation\n" );
return GL_FALSE;

10
ps3/rgl/src/ps3/rgl_ps3_raster.cpp
View File

@ -1458,7 +1458,7 @@ GLAPI void APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count)
// Push a CG program onto the current command buffer
// make sure there is space for the pushbuffer + any nops we need to add for alignment
if ( fifo->current + spaceInWords + 1024 > fifo->end )
if ( fifo->ctx.current + spaceInWords + 1024 > fifo->ctx.end )
rglOutOfSpaceCallback( fifo, spaceInWords );
rglGcmSetVertexProgramLoad(thisContext, &conf, program->ucode );
@ -1586,18 +1586,18 @@ GLAPI void APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count)
// Push a CG program onto the current command buffer
// make sure there is space for the pushbuffer + any nops we need to add for alignment
if ( fifo->current + spaceInWords + 1024 > fifo->end )
if ( fifo->ctx.current + spaceInWords + 1024 > fifo->ctx.end )
rglOutOfSpaceCallback( fifo, spaceInWords );
// first add nops to get us the next alligned position in the fifo
// [YLIN] Use VMX register to copy
uint32_t padding_in_word = ( ( 0x10-(((uint32_t)rglGcmState_i.fifo.current)&0xf))&0xf )>>2;
uint32_t padding_in_word = ( ( 0x10-(((uint32_t)rglGcmState_i.fifo.ctx.current)&0xf))&0xf )>>2;
uint32_t padded_size = ( ((cgprog->constantPushBufferWordSize)<<2) + 0xf )&~0xf;
unsigned i;
rglGcmSetNopCommand(thisContext, i, padding_in_word );
memcpy16(rglGcmState_i.fifo.current, cgprog->constantPushBuffer, padded_size);
rglGcmState_i.fifo.current+=cgprog->constantPushBufferWordSize;
memcpy16(rglGcmState_i.fifo.ctx.current, cgprog->constantPushBuffer, padded_size);
rglGcmState_i.fifo.ctx.current+=cgprog->constantPushBufferWordSize;
}
if (RGL_UNLIKELY(needValidate & RGL_VALIDATE_FRAGMENT_PROGRAM))