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

GBA Core: Separate mVL proxy from generic proxy

This commit is contained in:
Vicki Pfau 2019-06-04 12:53:04 -07:00
parent 4a2d8d078b
commit 42818c764d
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gba/core.c
View File

@ -133,6 +133,7 @@ struct GBACore {
#if defined(BUILD_GLES2) || defined(BUILD_GLES3) #if defined(BUILD_GLES2) || defined(BUILD_GLES3)
struct GBAVideoGLRenderer glRenderer; struct GBAVideoGLRenderer glRenderer;
#endif #endif
struct GBAVideoProxyRenderer vlProxy;
struct GBAVideoProxyRenderer proxyRenderer; struct GBAVideoProxyRenderer proxyRenderer;
struct mVideoLogContext* logContext; struct mVideoLogContext* logContext;
struct mCoreCallbacks logCallbacks; struct mCoreCallbacks logCallbacks;
@ -188,6 +189,7 @@ static bool _GBACoreInit(struct mCore* core) {
#ifndef DISABLE_THREADING #ifndef DISABLE_THREADING
mVideoThreadProxyCreate(&gbacore->threadProxy); mVideoThreadProxyCreate(&gbacore->threadProxy);
#endif #endif
gbacore->vlProxy.logger = NULL;
gbacore->proxyRenderer.logger = NULL; gbacore->proxyRenderer.logger = NULL;
gbacore->keys = 0; gbacore->keys = 0;
@ -978,22 +980,22 @@ static void _GBACoreStartVideoLog(struct mCore* core, struct mVideoLogContext* c
state->cpu.gprs[ARM_PC] = BASE_WORKING_RAM; state->cpu.gprs[ARM_PC] = BASE_WORKING_RAM;
int channelId = mVideoLoggerAddChannel(context); int channelId = mVideoLoggerAddChannel(context);
gbacore->proxyRenderer.logger = malloc(sizeof(struct mVideoLogger)); gbacore->vlProxy.logger = malloc(sizeof(struct mVideoLogger));
mVideoLoggerRendererCreate(gbacore->proxyRenderer.logger, false); mVideoLoggerRendererCreate(gbacore->vlProxy.logger, false);
mVideoLoggerAttachChannel(gbacore->proxyRenderer.logger, context, channelId); mVideoLoggerAttachChannel(gbacore->vlProxy.logger, context, channelId);
gbacore->proxyRenderer.logger->block = false; gbacore->vlProxy.logger->block = false;
GBAVideoProxyRendererCreate(&gbacore->proxyRenderer, &gbacore->renderer.d); GBAVideoProxyRendererCreate(&gbacore->vlProxy, gba->video.renderer);
GBAVideoProxyRendererShim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererShim(&gba->video, &gbacore->vlProxy);
} }
static void _GBACoreEndVideoLog(struct mCore* core) { static void _GBACoreEndVideoLog(struct mCore* core) {
struct GBACore* gbacore = (struct GBACore*) core; struct GBACore* gbacore = (struct GBACore*) core;
struct GBA* gba = core->board; struct GBA* gba = core->board;
if (gbacore->proxyRenderer.logger) { if (gbacore->vlProxy.logger) {
GBAVideoProxyRendererUnshim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererUnshim(&gba->video, &gbacore->vlProxy);
free(gbacore->proxyRenderer.logger); free(gbacore->vlProxy.logger);
gbacore->proxyRenderer.logger = NULL; gbacore->vlProxy.logger = NULL;
} }
} }
#endif #endif
@ -1090,10 +1092,10 @@ static void _GBAVLPStartFrameCallback(void *context) {
struct GBACore* gbacore = (struct GBACore*) core; struct GBACore* gbacore = (struct GBACore*) core;
struct GBA* gba = core->board; struct GBA* gba = core->board;
if (!mVideoLoggerRendererRun(gbacore->proxyRenderer.logger, true)) { if (!mVideoLoggerRendererRun(gbacore->vlProxy.logger, true)) {
GBAVideoProxyRendererUnshim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererUnshim(&gba->video, &gbacore->vlProxy);
mVideoLogContextRewind(gbacore->logContext, core); mVideoLogContextRewind(gbacore->logContext, core);
GBAVideoProxyRendererShim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererShim(&gba->video, &gbacore->vlProxy);
gba->earlyExit = true; gba->earlyExit = true;
} }
} }
@ -1103,14 +1105,14 @@ static bool _GBAVLPInit(struct mCore* core) {
if (!_GBACoreInit(core)) { if (!_GBACoreInit(core)) {
return false; return false;
} }
gbacore->proxyRenderer.logger = malloc(sizeof(struct mVideoLogger)); gbacore->vlProxy.logger = malloc(sizeof(struct mVideoLogger));
mVideoLoggerRendererCreate(gbacore->proxyRenderer.logger, true); mVideoLoggerRendererCreate(gbacore->vlProxy.logger, true);
GBAVideoProxyRendererCreate(&gbacore->proxyRenderer, NULL); GBAVideoProxyRendererCreate(&gbacore->vlProxy, NULL);
memset(&gbacore->logCallbacks, 0, sizeof(gbacore->logCallbacks)); memset(&gbacore->logCallbacks, 0, sizeof(gbacore->logCallbacks));
gbacore->logCallbacks.videoFrameStarted = _GBAVLPStartFrameCallback; gbacore->logCallbacks.videoFrameStarted = _GBAVLPStartFrameCallback;
gbacore->logCallbacks.context = core; gbacore->logCallbacks.context = core;
core->addCoreCallbacks(core, &gbacore->logCallbacks); core->addCoreCallbacks(core, &gbacore->logCallbacks);
core->videoLogger = gbacore->proxyRenderer.logger; core->videoLogger = gbacore->vlProxy.logger;
return true; return true;
} }
@ -1125,8 +1127,8 @@ static void _GBAVLPDeinit(struct mCore* core) {
static void _GBAVLPReset(struct mCore* core) { static void _GBAVLPReset(struct mCore* core) {
struct GBACore* gbacore = (struct GBACore*) core; struct GBACore* gbacore = (struct GBACore*) core;
struct GBA* gba = (struct GBA*) core->board; struct GBA* gba = (struct GBA*) core->board;
if (gba->video.renderer == &gbacore->proxyRenderer.d) { if (gba->video.renderer == &gbacore->vlProxy.d) {
GBAVideoProxyRendererUnshim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererUnshim(&gba->video, &gbacore->vlProxy);
} else if (gbacore->renderer.outputBuffer) { } else if (gbacore->renderer.outputBuffer) {
struct GBAVideoRenderer* renderer = &gbacore->renderer.d; struct GBAVideoRenderer* renderer = &gbacore->renderer.d;
GBAVideoAssociateRenderer(&gba->video, renderer); GBAVideoAssociateRenderer(&gba->video, renderer);
@ -1134,7 +1136,7 @@ static void _GBAVLPReset(struct mCore* core) {
ARMReset(core->cpu); ARMReset(core->cpu);
mVideoLogContextRewind(gbacore->logContext, core); mVideoLogContextRewind(gbacore->logContext, core);
GBAVideoProxyRendererShim(&gba->video, &gbacore->proxyRenderer); GBAVideoProxyRendererShim(&gba->video, &gbacore->vlProxy);
// Make sure CPU loop never spins // Make sure CPU loop never spins
GBAHalt(gba); GBAHalt(gba);
@ -1150,7 +1152,7 @@ static bool _GBAVLPLoadROM(struct mCore* core, struct VFile* vf) {
gbacore->logContext = NULL; gbacore->logContext = NULL;
return false; return false;
} }
mVideoLoggerAttachChannel(gbacore->proxyRenderer.logger, gbacore->logContext, 0); mVideoLoggerAttachChannel(gbacore->vlProxy.logger, gbacore->logContext, 0);
return true; return true;
} }