ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up thread locking in the software renderer

This commit is contained in:
Jeffrey Pfau 2013-05-11 21:07:10 -07:00
parent 63b72657c1
commit c20efb42ff
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gba/renderers/video-software.c
View File

@ -108,6 +108,10 @@ static void GBAVideoSoftwareRendererInit(struct GBAVideoRenderer* renderer) {
static void GBAVideoSoftwareRendererDeinit(struct GBAVideoRenderer* renderer) { static void GBAVideoSoftwareRendererDeinit(struct GBAVideoRenderer* renderer) {
struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer; struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer;
pthread_mutex_lock(&softwareRenderer->mutex);
pthread_cond_broadcast(&softwareRenderer->upCond);
pthread_mutex_unlock(&softwareRenderer->mutex);
pthread_mutex_destroy(&softwareRenderer->mutex); pthread_mutex_destroy(&softwareRenderer->mutex);
pthread_cond_destroy(&softwareRenderer->upCond); pthread_cond_destroy(&softwareRenderer->upCond);
pthread_cond_destroy(&softwareRenderer->downCond); pthread_cond_destroy(&softwareRenderer->downCond);

17
src/sdl/main.c
View File

@ -110,7 +110,6 @@ static int _GBASDLInit(struct GLSoftwareRenderer* renderer) {
static void _GBASDLRunloop(struct GBAThread* context, struct GLSoftwareRenderer* renderer) { static void _GBASDLRunloop(struct GBAThread* context, struct GLSoftwareRenderer* renderer) {
SDL_Event event; SDL_Event event;
int err;
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
@ -119,7 +118,7 @@ static void _GBASDLRunloop(struct GBAThread* context, struct GLSoftwareRenderer*
glMatrixMode (GL_PROJECTION); glMatrixMode (GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
glOrtho(0, 240, 160, 0, 0, 1); glOrtho(0, 240, 160, 0, 0, 1);
while (context->started) { while (context->started && context->debugger->state != DEBUGGER_EXITING) {
pthread_mutex_lock(&renderer->d.mutex); pthread_mutex_lock(&renderer->d.mutex);
if (renderer->d.d.framesPending) { if (renderer->d.d.framesPending) {
renderer->d.d.framesPending = 0; renderer->d.d.framesPending = 0;
@ -135,23 +134,13 @@ static void _GBASDLRunloop(struct GBAThread* context, struct GLSoftwareRenderer*
} }
pthread_mutex_lock(&renderer->d.mutex); pthread_mutex_lock(&renderer->d.mutex);
pthread_cond_broadcast(&renderer->d.downCond); pthread_cond_broadcast(&renderer->d.downCond);
pthread_mutex_unlock(&renderer->d.mutex);
} else { } else {
while (!renderer->d.d.framesPending) { pthread_cond_broadcast(&renderer->d.downCond);
struct timeval tv; pthread_cond_wait(&renderer->d.upCond, &renderer->d.mutex);
struct timespec ts;
gettimeofday(&tv, 0);
ts.tv_sec = tv.tv_sec;
ts.tv_nsec = tv.tv_usec * 1000 + 800000;
err = pthread_cond_timedwait(&renderer->d.upCond, &renderer->d.mutex, &ts);
if (err == ETIMEDOUT) {
break;
}
} }
pthread_mutex_unlock(&renderer->d.mutex); pthread_mutex_unlock(&renderer->d.mutex);
} }
} }
}
static void _GBASDLDeinit(struct GLSoftwareRenderer* renderer) { static void _GBASDLDeinit(struct GLSoftwareRenderer* renderer) {
free(renderer->d.outputBuffer); free(renderer->d.outputBuffer);