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

SDL: Allow GLES2 and GL backends to be compiled at the same time

This commit is contained in:
Jeffrey Pfau 2015-10-28 23:21:09 -07:00
parent 08c7c805a8
commit a3803a853c
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/platform/sdl/gles2-sdl.c
View File

@ -96,18 +96,18 @@ bool GBASDLGLES2Init(struct SDLSoftwareRenderer* renderer) {
renderer->d.outputBuffer = memalign(16, 256 * 256 * 4); renderer->d.outputBuffer = memalign(16, 256 * 256 * 4);
renderer->d.outputBufferStride = 256; renderer->d.outputBufferStride = 256;
GBAGLES2ContextCreate(&renderer->gl); GBAGLES2ContextCreate(&renderer->gl2);
renderer->gl.d.user = renderer; renderer->gl2.d.user = renderer;
renderer->gl.d.lockAspectRatio = renderer->lockAspectRatio; renderer->gl2.d.lockAspectRatio = renderer->lockAspectRatio;
renderer->gl.d.filter = renderer->filter; renderer->gl2.d.filter = renderer->filter;
renderer->gl.d.swap = GBASDLGLCommonSwap; renderer->gl2.d.swap = GBASDLGLCommonSwap;
renderer->gl.d.init(&renderer->gl.d, 0); renderer->gl2.d.init(&renderer->gl2.d, 0);
return true; return true;
} }
void GBASDLGLES2Runloop(struct GBAThread* context, struct SDLSoftwareRenderer* renderer) { void GBASDLGLES2Runloop(struct GBAThread* context, struct SDLSoftwareRenderer* renderer) {
SDL_Event event; SDL_Event event;
struct VideoBackend* v = &renderer->gl.d; struct VideoBackend* v = &renderer->gl2.d;
while (context->state < THREAD_EXITING) { while (context->state < THREAD_EXITING) {
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
@ -128,8 +128,8 @@ void GBASDLGLES2Runloop(struct GBAThread* context, struct SDLSoftwareRenderer* r
} }
void GBASDLGLES2Deinit(struct SDLSoftwareRenderer* renderer) { void GBASDLGLES2Deinit(struct SDLSoftwareRenderer* renderer) {
if (renderer->gl.d.deinit) { if (renderer->gl2.d.deinit) {
renderer->gl.d.deinit(&renderer->gl.d); renderer->gl2.d.deinit(&renderer->gl2.d);
} }
#ifdef BUILD_RASPI #ifdef BUILD_RASPI
eglMakeCurrent(renderer->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(renderer->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);

5
src/platform/sdl/main.h
View File

@ -62,8 +62,9 @@ struct SDLSoftwareRenderer {
#ifdef BUILD_GL #ifdef BUILD_GL
struct GBAGLContext gl; struct GBAGLContext gl;
#elif BUILD_GLES2 #endif
struct GBAGLES2Context gl; #ifdef BUILD_GLES2
struct GBAGLES2Context gl2;
#endif #endif
#ifdef USE_PIXMAN #ifdef USE_PIXMAN