CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 11:18:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(RGL PS3) Optimizations

Browse Source
This commit is contained in:
twinaphex 2013-11-02 03:03:28 +01:00
parent 375c3c6806
commit 3e914f42b3
5 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/gl_common.h
View File

@ -298,6 +298,14 @@ typedef struct gl
// Platform specific workarounds/hacks.
#if defined(__CELLOS_LV2__)
#define NO_GL_READ_VIEWPORT
// Performance hacks
#ifdef HAVE_RGL
extern GLvoid* glMapBufferTextureReferenceRA( GLenum target, GLenum access );
extern GLboolean glUnmapBufferTextureReferenceRA( GLenum target );
#define glMapBuffer(target, access) glMapBufferTextureReferenceRA(target, access)
#define glUnmapBuffer(target) glUnmapBufferTextureReferenceRA(target)
#endif
#endif
#if defined(HAVE_OPENGL_MODERN) || defined(HAVE_OPENGLES2) || defined(HAVE_PSGL)

2
ps3/rgl/include/export/GLES/glext.h
View File

@ -411,6 +411,8 @@ extern "C"
/* Texture Reference */
GLAPI void APIENTRY glTextureReferenceSCE( GLenum target, GLuint levels, GLuint baseWidth, GLuint baseHeight, GLuint baseDepth, GLenum internalFormat, GLuint pitch, GLintptr offset );
GLAPI GLvoid* APIENTRY glMapBufferTextureReferenceRA( GLenum target, GLenum access );
GLAPI GLboolean APIENTRY glUnmapBufferTextureReferenceRA( GLenum target );
#ifdef __cplusplus
}

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

@ -141,6 +141,7 @@ extern GmmAllocator *pGmmLocalAllocator;
#define gmmAllocFixedTileBlock() ((GmmTileBlock*)gmmAllocFixed(1))
#define gmmFreeFixedTileBlock(data) (gmmFreeFixed(1, (GmmTileBlock*)data))
#define gmmFreeFixedBlock(data) (gmmFreeFixed(0, (GmmBlock*)data))
#define gmmAllocTileBlock(pAllocator, size, pBlock) ((pBlock == NULL) ? gmmCreateTileBlock(pAllocator, size) : pBlock)
void gmmSetTileAttrib(
const uint32_t id,

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

@ -26,6 +26,14 @@ static inline GLuint rglPlatformGetBitsPerPixel (GLenum internalFormat)
#define SUBPIXEL_BITS 12
#define SUBPIXEL_ADJUST (0.5/(1<<SUBPIXEL_BITS))
#define rglDisableVertexAttribArrayNVInline(context, index) \
RGLBIT_FALSE(context->attribs->EnabledMask, index); \
RGLBIT_TRUE(context->attribs->DirtyMask, index);
#define rglEnableVertexAttribArrayNVInline(context, index) \
RGLBIT_TRUE(context->attribs->EnabledMask, index); \
RGLBIT_TRUE(context->attribs->DirtyMask, index);
#define rglGcmSetVertexData4f(thisContext, index, v) \
thisContext->current[0] = (((4) << (18)) | (CELL_GCM_NV4097_SET_VERTEX_DATA4F_M + (index) * 16)); \
memcpy(&thisContext->current[1], v, sizeof(float)*4); \

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

@ -838,17 +838,6 @@ static uint32_t gmmAllocExtendedTileBlock(const uint32_t size, const uint32_t ta
return retId;
}
static GmmTileBlock *gmmAllocTileBlock(GmmAllocator *pAllocator,
const uint32_t size)
{
GmmTileBlock *pBlock = gmmFindFreeTileBlock(pAllocator, size);
if (pBlock == NULL)
pBlock = gmmCreateTileBlock(pAllocator, size);
return pBlock;
}
static void gmmFreeBlock (void *data)
{
GmmBlock *pBlock = (GmmBlock*)data;
@ -1330,22 +1319,6 @@ static uint8_t gmmInternalSweep(void *data)
return ret;
}
static void gmmRemovePendingFree (GmmAllocator *pAllocator,
GmmBlock *pBlock)
{
if (pBlock == pAllocator->pPendingFreeHead)
pAllocator->pPendingFreeHead = pBlock->pNextFree;
if (pBlock == pAllocator->pPendingFreeTail)
pAllocator->pPendingFreeTail = pBlock->pPrevFree;
if (pBlock->pNextFree)
pBlock->pNextFree->pPrevFree = pBlock->pPrevFree;
if (pBlock->pPrevFree)
pBlock->pPrevFree->pNextFree = pBlock->pNextFree;
}
static void gmmFreeAll(void)
{
GmmBlock *pBlock;
@ -1400,7 +1373,10 @@ static uint32_t gmmInternalAlloc(
uint32_t retId;
if (isTile)
retId = (uint32_t)gmmAllocTileBlock(pAllocator, size);
{
GmmTileBlock *pBlock = gmmFindFreeTileBlock(pAllocator, size);
retId = (uint32_t)gmmAllocTileBlock(pAllocator, size, pBlock);
}
else
retId = (uint32_t)gmmAllocBlock(pAllocator, size);
@ -3029,7 +3005,16 @@ GLAPI void RGL_EXPORT psglSwap (void)
if ( !(( fence - pBlock->fence ) & 0x80000000 ) )
{
gmmRemovePendingFree(pAllocator, pBlock);
/* remove pending free */
if (pBlock == pAllocator->pPendingFreeHead)
pAllocator->pPendingFreeHead = pBlock->pNextFree;
if (pBlock == pAllocator->pPendingFreeTail)
pAllocator->pPendingFreeTail = pBlock->pPrevFree;
if (pBlock->pNextFree)
pBlock->pNextFree->pPrevFree = pBlock->pPrevFree;
if (pBlock->pPrevFree)
pBlock->pPrevFree->pNextFree = pBlock->pNextFree;
gmmAddFree(pAllocator, pBlock);
}
@ -3188,6 +3173,32 @@ GLAPI void APIENTRY glBindBuffer( GLenum target, GLuint name )
}
}
#ifdef __cplusplus
extern "C" {
#endif
GLAPI GLvoid* APIENTRY glMapBufferTextureReferenceRA( GLenum target, GLenum access )
{
RGLcontext *LContext = _CurrentContext;
rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[LContext->TextureBuffer];
bufferObject->mapped = GL_TRUE;
return rglPlatformBufferObjectMap(bufferObject, access);
}
GLAPI GLboolean APIENTRY glUnmapBufferTextureReferenceRA( GLenum target )
{
RGLcontext *LContext = _CurrentContext;
rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[LContext->TextureBuffer];
bufferObject->mapped = GL_FALSE;
return rglPlatformBufferObjectUnmap( bufferObject );
}
#ifdef __cplusplus
}
#endif
GLAPI GLvoid* APIENTRY glMapBuffer( GLenum target, GLenum access )
{
RGLcontext *LContext = _CurrentContext;
@ -3241,6 +3252,7 @@ GLAPI GLboolean APIENTRY glUnmapBuffer( GLenum target )
return result;
}
GLAPI void APIENTRY glDeleteBuffers( GLsizei n, const GLuint *buffers )
{
RGLcontext *LContext = (RGLcontext*)_CurrentContext;
@ -3272,8 +3284,7 @@ GLAPI void APIENTRY glDeleteBuffers( GLsizei n, const GLuint *buffers )
GLAPI void APIENTRY glGenBuffers( GLsizei n, GLuint *buffers )
{
RGLcontext *LContext = (RGLcontext*)_CurrentContext;
rglTexNameSpaceGenNames( &LContext->bufferObjectNameSpace, n, buffers );
rglTexNameSpaceGenNames( &((RGLcontext*)_CurrentContext)->bufferObjectNameSpace, n, buffers );
}
GLAPI void APIENTRY glBufferData( GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage )
@ -4184,39 +4195,35 @@ GLAPI void APIENTRY glDisable( GLenum cap )
GLAPI void APIENTRY glEnableClientState( GLenum array )
{
switch ( array )
RGLcontext *context = (RGLcontext*)_CurrentContext;
switch (array)
{
case GL_VERTEX_ARRAY:
rglEnableVertexAttribArrayNV( RGL_ATTRIB_POSITION_INDEX );
rglEnableVertexAttribArrayNVInline(context, RGL_ATTRIB_POSITION_INDEX );
break;
case GL_COLOR_ARRAY:
rglEnableVertexAttribArrayNV( RGL_ATTRIB_PRIMARY_COLOR_INDEX );
rglEnableVertexAttribArrayNVInline(context, RGL_ATTRIB_PRIMARY_COLOR_INDEX );
break;
case GL_NORMAL_ARRAY:
rglEnableVertexAttribArrayNV( RGL_ATTRIB_NORMAL_INDEX );
rglEnableVertexAttribArrayNVInline(context, RGL_ATTRIB_NORMAL_INDEX );
break;
default:
rglSetError( GL_INVALID_ENUM );
return;
}
}
GLAPI void APIENTRY glDisableClientState( GLenum array )
{
switch ( array )
RGLcontext *context = (RGLcontext*)_CurrentContext;
switch (array)
{
case GL_VERTEX_ARRAY:
rglDisableVertexAttribArrayNV( RGL_ATTRIB_POSITION_INDEX );
rglDisableVertexAttribArrayNVInline(context, RGL_ATTRIB_POSITION_INDEX );
break;
case GL_COLOR_ARRAY:
rglDisableVertexAttribArrayNV( RGL_ATTRIB_PRIMARY_COLOR_INDEX );
rglDisableVertexAttribArrayNVInline(context, RGL_ATTRIB_PRIMARY_COLOR_INDEX );
break;
case GL_NORMAL_ARRAY:
rglDisableVertexAttribArrayNV( RGL_ATTRIB_NORMAL_INDEX );
rglDisableVertexAttribArrayNVInline(context, RGL_ATTRIB_NORMAL_INDEX );
break;
default:
rglSetError( GL_INVALID_ENUM );
return;
}
}