mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 17:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGL PS3) Optimizations for glBufferSubData

Browse Source
This commit is contained in:
twinaphex 2013-11-02 14:44:13 +01:00
parent aabbf835fc
commit bef038e73e
3 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/gl_common.h
View File

@ -303,8 +303,10 @@ typedef struct gl
#ifdef HAVE_RGL #ifdef HAVE_RGL
extern GLvoid* glMapBufferTextureReferenceRA( GLenum target, GLenum access ); extern GLvoid* glMapBufferTextureReferenceRA( GLenum target, GLenum access );
extern GLboolean glUnmapBufferTextureReferenceRA( GLenum target ); extern GLboolean glUnmapBufferTextureReferenceRA( GLenum target );
extern void glBufferSubDataTextureReferenceRA( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data );
#define glMapBuffer(target, access) glMapBufferTextureReferenceRA(target, access) #define glMapBuffer(target, access) glMapBufferTextureReferenceRA(target, access)
#define glUnmapBuffer(target) glUnmapBufferTextureReferenceRA(target) #define glUnmapBuffer(target) glUnmapBufferTextureReferenceRA(target)
#define glBufferSubData(target, offset, size, data) glBufferSubDataTextureReferenceRA(target, offset, size, data)
#endif #endif
#endif #endif

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

@ -3272,14 +3272,6 @@ GLAPI void APIENTRY glBufferData( GLenum target, GLsizeiptr size, const GLvoid *
} }
rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name]; rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name];
if ( bufferObject->refCount > 1 )
{
rglTexNameSpaceDeleteNames( &LContext->bufferObjectNameSpace, 1, &name );
rglTexNameSpaceCreateNameLazy( &LContext->bufferObjectNameSpace, name );
bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name];
}
if (bufferObject->size > 0) if (bufferObject->size > 0)
rglPlatformDestroyBufferObject( bufferObject ); rglPlatformDestroyBufferObject( bufferObject );

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

@ -1171,6 +1171,7 @@ void rglPlatformBufferObjectSetData(void *buf_data, GLintptr offset, GLsizeiptr
} }
} }
GLAPI void APIENTRY glBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data ) GLAPI void APIENTRY glBufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data )
{ {
RGLcontext *LContext = (RGLcontext*)_CurrentContext; RGLcontext *LContext = (RGLcontext*)_CurrentContext;
@ -1193,33 +1194,6 @@ GLAPI void APIENTRY glBufferSubData( GLenum target, GLintptr offset, GLsizeiptr
} }
rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name]; rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name];
if ( bufferObject->refCount > 1 )
{
rglBufferObject* oldBufferObject = bufferObject;
rglTexNameSpaceDeleteNames( &LContext->bufferObjectNameSpace, 1, &name );
rglTexNameSpaceCreateNameLazy( &LContext->bufferObjectNameSpace, name );
bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name];
bufferObject->size = oldBufferObject->size;
GLboolean created = rglpCreateBufferObject(bufferObject);
if ( !created )
{
rglSetError( GL_OUT_OF_MEMORY );
return;
}
rglGcmDriver *driver = (rglGcmDriver*)_CurrentDevice->rasterDriver;
rglBufferObject *in_dst = (rglBufferObject*)bufferObject;
rglBufferObject *in_src = (rglBufferObject*)oldBufferObject;
rglGcmBufferObject* dst = (rglGcmBufferObject*)in_dst->platformBufferObject;
rglGcmBufferObject* src = (rglGcmBufferObject*)in_src->platformBufferObject;
rglGcmTransferData( dst->bufferId, 0, src->bufferSize, src->bufferId, 0, src->bufferSize, src->bufferSize, 1 );
}
rglPlatformBufferObjectSetData( bufferObject, offset, size, data, GL_FALSE ); rglPlatformBufferObjectSetData( bufferObject, offset, size, data, GL_FALSE );
} }
@ -1304,6 +1278,46 @@ GLboolean rglPlatformBufferObjectUnmap (void *data)
extern "C" { extern "C" {
#endif #endif
static void rglPlatformBufferObjectSetDataTextureReference(void *buf_data, GLintptr offset, GLsizeiptr size, const GLvoid *data, GLboolean tryImmediateCopy)
{
rglBufferObject *bufferObject = (rglBufferObject*)buf_data;
rglGcmDriver *driver = (rglGcmDriver*)_CurrentDevice->rasterDriver;
rglGcmBufferObject *rglBuffer = ( rglGcmBufferObject * )bufferObject->platformBufferObject;
if ( size >= bufferObject->size )
{
// reallocate the buffer
// To avoid waiting for the GPU to finish with the buffer, just
// allocate a whole new one.
rglBuffer->bufferSize = rglPad( size, RGL_BUFFER_OBJECT_BLOCK_SIZE );
rglpsAllocateBuffer( bufferObject );
// copy directly to newly allocated memory
// TODO: For GPU destination, should we copy to system memory and
// pull from GPU?
memset( gmmIdToAddress(rglBuffer->bufferId), 0, size );
}
else
{
// partial buffer write
// STREAM and DYNAMIC buffers get transfer via a bounce buffer.
// copy via bounce buffer
GLuint id = gmmAlloc((CellGcmContextData*)&rglGcmState_i.fifo, 0, size);
memset(gmmIdToAddress(id), 0, size);
rglGcmTransferData(rglBuffer->bufferId, offset, rglBuffer->pitch, id, 0, size, size, 1);
gmmFree(id);
}
}
GLAPI void APIENTRY glBufferSubDataTextureReferenceRA( GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data )
{
RGLcontext *LContext = (RGLcontext*)_CurrentContext;
GLuint name = LContext->TextureBuffer;
rglBufferObject* bufferObject = (rglBufferObject*)LContext->bufferObjectNameSpace.data[name];
rglPlatformBufferObjectSetDataTextureReference( bufferObject, offset, size, data, GL_FALSE );
}
char *rglPlatformBufferObjectMapTextureReference(void *data, GLenum access) char *rglPlatformBufferObjectMapTextureReference(void *data, GLenum access)
{ {
rglBufferObject *bufferObject = (rglBufferObject*)data; rglBufferObject *bufferObject = (rglBufferObject*)data;