encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

emscripten: Fixed compiling without OpenGL support.

This commit is contained in:
Philipp Wiesemann 2017-08-05 22:10:48 +02:00
parent f216b446aa
commit 711df8a989
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/emscripten/SDL_emscriptenvideo.c
View File

@ -111,6 +111,7 @@ Emscripten_CreateDevice(int devindex)
device->UpdateWindowFramebuffer = Emscripten_UpdateWindowFramebuffer; device->UpdateWindowFramebuffer = Emscripten_UpdateWindowFramebuffer;
device->DestroyWindowFramebuffer = Emscripten_DestroyWindowFramebuffer; device->DestroyWindowFramebuffer = Emscripten_DestroyWindowFramebuffer;
#if SDL_VIDEO_OPENGL_EGL
device->GL_LoadLibrary = Emscripten_GLES_LoadLibrary; device->GL_LoadLibrary = Emscripten_GLES_LoadLibrary;
device->GL_GetProcAddress = Emscripten_GLES_GetProcAddress; device->GL_GetProcAddress = Emscripten_GLES_GetProcAddress;
device->GL_UnloadLibrary = Emscripten_GLES_UnloadLibrary; device->GL_UnloadLibrary = Emscripten_GLES_UnloadLibrary;
@ -121,6 +122,7 @@ Emscripten_CreateDevice(int devindex)
device->GL_SwapWindow = Emscripten_GLES_SwapWindow; device->GL_SwapWindow = Emscripten_GLES_SwapWindow;
device->GL_DeleteContext = Emscripten_GLES_DeleteContext; device->GL_DeleteContext = Emscripten_GLES_DeleteContext;
device->GL_GetDrawableSize = Emscripten_GLES_GetDrawableSize; device->GL_GetDrawableSize = Emscripten_GLES_GetDrawableSize;
#endif
device->free = Emscripten_DeleteDevice; device->free = Emscripten_DeleteDevice;
@ -228,6 +230,7 @@ Emscripten_CreateWindow(_THIS, SDL_Window * window)
} }
} }
#if SDL_VIDEO_OPENGL_EGL
if (window->flags & SDL_WINDOW_OPENGL) { if (window->flags & SDL_WINDOW_OPENGL) {
if (!_this->egl_data) { if (!_this->egl_data) {
if (SDL_GL_LoadLibrary(NULL) < 0) { if (SDL_GL_LoadLibrary(NULL) < 0) {
@ -240,6 +243,7 @@ Emscripten_CreateWindow(_THIS, SDL_Window * window)
return SDL_SetError("Could not create GLES window surface"); return SDL_SetError("Could not create GLES window surface");
} }
} }
#endif
wdata->window = window; wdata->window = window;
@ -284,10 +288,12 @@ Emscripten_DestroyWindow(_THIS, SDL_Window * window)
data = (SDL_WindowData *) window->driverdata; data = (SDL_WindowData *) window->driverdata;
Emscripten_UnregisterEventHandlers(data); Emscripten_UnregisterEventHandlers(data);
#if SDL_VIDEO_OPENGL_EGL
if (data->egl_surface != EGL_NO_SURFACE) { if (data->egl_surface != EGL_NO_SURFACE) {
SDL_EGL_DestroySurface(_this, data->egl_surface); SDL_EGL_DestroySurface(_this, data->egl_surface);
data->egl_surface = EGL_NO_SURFACE; data->egl_surface = EGL_NO_SURFACE;
} }
#endif
SDL_free(window->driverdata); SDL_free(window->driverdata);
window->driverdata = NULL; window->driverdata = NULL;
} }

2
src/video/emscripten/SDL_emscriptenvideo.h
View File

@ -28,7 +28,9 @@
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
#include <emscripten/html5.h> #include <emscripten/html5.h>
#if SDL_VIDEO_OPENGL_EGL
#include <EGL/egl.h> #include <EGL/egl.h>
#endif
typedef struct SDL_WindowData typedef struct SDL_WindowData
{ {