kc3-lang/SDL

diff --git a/src/video/offscreen/SDL_offscreenevents.c b/src/video/offscreen/SDL_offscreenevents.c
index a14e0b2..092f19b 100644
--- a/src/video/offscreen/SDL_offscreenevents.c
+++ b/src/video/offscreen/SDL_offscreenevents.c
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #if SDL_VIDEO_DRIVER_OFFSCREEN
diff --git a/src/video/offscreen/SDL_offscreenevents_c.h b/src/video/offscreen/SDL_offscreenevents_c.h
index 3d26149..6768d3d 100644
--- a/src/video/offscreen/SDL_offscreenevents_c.h
+++ b/src/video/offscreen/SDL_offscreenevents_c.h
@@ -18,11 +18,8 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
-#include "SDL_offscreenvideo.h"
-
 extern void OFFSCREEN_PumpEvents(_THIS);
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenframebuffer.c b/src/video/offscreen/SDL_offscreenframebuffer.c
index 3ca57e8..c2d99e5 100644
--- a/src/video/offscreen/SDL_offscreenframebuffer.c
+++ b/src/video/offscreen/SDL_offscreenframebuffer.c
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #if SDL_VIDEO_DRIVER_OFFSCREEN
diff --git a/src/video/offscreen/SDL_offscreenframebuffer_c.h b/src/video/offscreen/SDL_offscreenframebuffer_c.h
index 82ae06c..ae1ad7b 100644
--- a/src/video/offscreen/SDL_offscreenframebuffer_c.h
+++ b/src/video/offscreen/SDL_offscreenframebuffer_c.h
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 extern int SDL_OFFSCREEN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
diff --git a/src/video/offscreen/SDL_offscreenopengl.c b/src/video/offscreen/SDL_offscreenopengl.c
deleted file mode 100644
index 8764152..0000000
--- a/src/video/offscreen/SDL_offscreenopengl.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "../../SDL_internal.h"
-
-#if SDL_VIDEO_DRIVER_OFFSCREEN
-
-#include "SDL_offscreenopengl.h"
-
-#include "SDL_opengl.h"
-
-int
-OFFSCREEN_GL_SwapWindow(_THIS, SDL_Window* window)
-{
-    OFFSCREEN_Window* offscreen_wind = window->driverdata;
-
-    SDL_EGL_SwapBuffers(_this, offscreen_wind->egl_surface);
-    return 0;
-}
-
-int
-OFFSCREEN_GL_MakeCurrent(_THIS, SDL_Window* window, SDL_GLContext context)
-{
-  if (window) {
-      EGLSurface egl_surface = ((OFFSCREEN_Window*)window->driverdata)->egl_surface;
-      return SDL_EGL_MakeCurrent(_this, egl_surface, context);
-  }
-
-  return SDL_EGL_MakeCurrent(_this, NULL, NULL);
-}
-
-SDL_GLContext
-OFFSCREEN_GL_CreateContext(_THIS, SDL_Window* window)
-{
-    OFFSCREEN_Window* offscreen_window = window->driverdata;
-
-    SDL_GLContext context;
-    context = SDL_EGL_CreateContext(_this, offscreen_window->egl_surface);
-
-    return context;
-}
-
-int
-OFFSCREEN_GL_LoadLibrary(_THIS, const char* path)
-{
-    int ret = SDL_EGL_LoadLibraryOnly(_this, path);
-    if (ret != 0) {
-        return ret;
-    }
-
-    /* driver_loaded gets incremented by SDL_GL_LoadLibrary when we return,
-       but SDL_EGL_InitializeOffscreen checks that we're loaded before then,
-       so temporarily bump it since we know that LoadLibraryOnly succeeded. */
-
-    _this->gl_config.driver_loaded++;
-    ret = SDL_EGL_InitializeOffscreen(_this, 0);
-    _this->gl_config.driver_loaded--;
-    if (ret != 0) {
-        return ret;
-    }
-
-    ret = SDL_EGL_ChooseConfig(_this);
-    if (ret != 0) {
-        return ret;
-    }
-
-    return 0;
-}
-
-void
-OFFSCREEN_GL_UnloadLibrary(_THIS)
-{
-    SDL_EGL_UnloadLibrary(_this);
-}
-
-void*
-OFFSCREEN_GL_GetProcAddress(_THIS, const char* proc)
-{
-    void* proc_addr = SDL_EGL_GetProcAddress(_this, proc);
-
-    if (!proc_addr) {
-        SDL_SetError("Failed to find proc address!");
-    }
-
-    return proc_addr;
-}
-
-#endif /* SDL_VIDEO_DRIVER_OFFSCREEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenopengl.h b/src/video/offscreen/SDL_offscreenopengl.h
deleted file mode 100644
index 1e2df69..0000000
--- a/src/video/offscreen/SDL_offscreenopengl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SDL_offscreenopengl_h
-#define _SDL_offscreenopengl_h
-
-#include "SDL_offscreenwindow.h"
-
-#include "../SDL_egl_c.h"
-
-#define OFFSCREEN_GL_DeleteContext   SDL_EGL_DeleteContext
-#define OFFSCREEN_GL_GetSwapInterval SDL_EGL_GetSwapInterval
-#define OFFSCREEN_GL_SetSwapInterval SDL_EGL_SetSwapInterval
-
-extern int
-OFFSCREEN_GL_SwapWindow(_THIS, SDL_Window* window);
-
-extern int
-OFFSCREEN_GL_MakeCurrent(_THIS, SDL_Window* window, SDL_GLContext context);
-
-extern SDL_GLContext
-OFFSCREEN_GL_CreateContext(_THIS, SDL_Window* window);
-
-extern int
-OFFSCREEN_GL_LoadLibrary(_THIS, const char* path);
-
-extern void
-OFFSCREEN_GL_UnloadLibrary(_THIS);
-
-extern void*
-OFFSCREEN_GL_GetProcAddress(_THIS, const char* proc);
-
-#endif /* _SDL_offscreenopengl_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
-
diff --git a/src/video/offscreen/SDL_offscreenopengles.c b/src/video/offscreen/SDL_offscreenopengles.c
new file mode 100644
index 0000000..a379ad7
--- /dev/null
+++ b/src/video/offscreen/SDL_offscreenopengles.c
@@ -0,0 +1,90 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_OFFSCREEN && SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_offscreenopengles.h"
+#include "SDL_offscreenvideo.h"
+#include "SDL_offscreenwindow.h"
+
+/* EGL implementation of SDL OpenGL support */
+
+int
+OFFSCREEN_GLES_LoadLibrary(_THIS, const char* path)
+{
+    int ret = SDL_EGL_LoadLibraryOnly(_this, path);
+    if (ret != 0) {
+        return ret;
+    }
+
+    /* driver_loaded gets incremented by SDL_GL_LoadLibrary when we return,
+       but SDL_EGL_InitializeOffscreen checks that we're loaded before then,
+       so temporarily bump it since we know that LoadLibraryOnly succeeded. */
+
+    _this->gl_config.driver_loaded++;
+    ret = SDL_EGL_InitializeOffscreen(_this, 0);
+    _this->gl_config.driver_loaded--;
+    if (ret != 0) {
+        return ret;
+    }
+
+    ret = SDL_EGL_ChooseConfig(_this);
+    if (ret != 0) {
+        return ret;
+    }
+
+    return 0;
+}
+
+SDL_GLContext
+OFFSCREEN_GLES_CreateContext(_THIS, SDL_Window* window)
+{
+    OFFSCREEN_Window* offscreen_window = window->driverdata;
+
+    SDL_GLContext context;
+    context = SDL_EGL_CreateContext(_this, offscreen_window->egl_surface);
+
+    return context;
+}
+
+int
+OFFSCREEN_GLES_MakeCurrent(_THIS, SDL_Window* window, SDL_GLContext context)
+{
+    if (window) {
+        EGLSurface egl_surface = ((OFFSCREEN_Window*)window->driverdata)->egl_surface;
+        return SDL_EGL_MakeCurrent(_this, egl_surface, context);
+    } else {
+        return SDL_EGL_MakeCurrent(_this, NULL, NULL);
+    }
+}
+
+int
+OFFSCREEN_GLES_SwapWindow(_THIS, SDL_Window* window)
+{
+    OFFSCREEN_Window* offscreen_wind = window->driverdata;
+
+    return SDL_EGL_SwapBuffers(_this, offscreen_wind->egl_surface);
+}
+
+#endif /* SDL_VIDEO_DRIVER_OFFSCREEN && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenopengles.h b/src/video/offscreen/SDL_offscreenopengles.h
new file mode 100644
index 0000000..6c9e518
--- /dev/null
+++ b/src/video/offscreen/SDL_offscreenopengles.h
@@ -0,0 +1,47 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_offscreenopengles_h
+#define _SDL_offscreenopengles_h
+
+#if SDL_VIDEO_DRIVER_OFFSCREEN && SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+
+#define OFFSCREEN_GLES_GetProcAddress  SDL_EGL_GetProcAddress
+#define OFFSCREEN_GLES_UnloadLibrary   SDL_EGL_UnloadLibrary
+#define OFFSCREEN_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define OFFSCREEN_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define OFFSCREEN_GLES_DeleteContext   SDL_EGL_DeleteContext
+
+extern int OFFSCREEN_GLES_LoadLibrary(_THIS, const char *path);
+extern SDL_GLContext OFFSCREEN_GLES_CreateContext(_THIS, SDL_Window *window);
+extern int OFFSCREEN_GLES_MakeCurrent(_THIS, SDL_Window *window, SDL_GLContext context);
+extern int OFFSCREEN_GLES_SwapWindow(_THIS, SDL_Window *window);
+
+#endif /* SDL_VIDEO_DRIVER_OFFSCREEN && SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_offscreenopengles_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/src/video/offscreen/SDL_offscreenvideo.c b/src/video/offscreen/SDL_offscreenvideo.c
index 3e1aafe..8e62e88 100644
--- a/src/video/offscreen/SDL_offscreenvideo.c
+++ b/src/video/offscreen/SDL_offscreenvideo.c
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #if SDL_VIDEO_DRIVER_OFFSCREEN
@@ -32,15 +31,12 @@
  */
 
 #include "SDL_video.h"
-#include "SDL_mouse.h"
-#include "../SDL_sysvideo.h"
-#include "../SDL_pixels_c.h"
-#include "../../events/SDL_events_c.h"
 
 #include "SDL_offscreenvideo.h"
 #include "SDL_offscreenevents_c.h"
 #include "SDL_offscreenframebuffer_c.h"
-#include "SDL_offscreenopengl.h"
+#include "SDL_offscreenopengles.h"
+#include "SDL_offscreenwindow.h"
 
 #define OFFSCREENVID_DRIVER_NAME "offscreen"
 
@@ -79,16 +75,18 @@ OFFSCREEN_CreateDevice(void)
     device->DestroyWindowFramebuffer = SDL_OFFSCREEN_DestroyWindowFramebuffer;
     device->free = OFFSCREEN_DeleteDevice;
 
+#if SDL_VIDEO_OPENGL_EGL
     /* GL context */
-    device->GL_SwapWindow = OFFSCREEN_GL_SwapWindow;
-    device->GL_MakeCurrent = OFFSCREEN_GL_MakeCurrent;
-    device->GL_CreateContext = OFFSCREEN_GL_CreateContext;
-    device->GL_DeleteContext = OFFSCREEN_GL_DeleteContext;
-    device->GL_LoadLibrary = OFFSCREEN_GL_LoadLibrary;
-    device->GL_UnloadLibrary = OFFSCREEN_GL_UnloadLibrary;
-    device->GL_GetProcAddress = OFFSCREEN_GL_GetProcAddress;
-    device->GL_GetSwapInterval = OFFSCREEN_GL_GetSwapInterval;
-    device->GL_SetSwapInterval = OFFSCREEN_GL_SetSwapInterval;
+    device->GL_SwapWindow = OFFSCREEN_GLES_SwapWindow;
+    device->GL_MakeCurrent = OFFSCREEN_GLES_MakeCurrent;
+    device->GL_CreateContext = OFFSCREEN_GLES_CreateContext;
+    device->GL_DeleteContext = OFFSCREEN_GLES_DeleteContext;
+    device->GL_LoadLibrary = OFFSCREEN_GLES_LoadLibrary;
+    device->GL_UnloadLibrary = OFFSCREEN_GLES_UnloadLibrary;
+    device->GL_GetProcAddress = OFFSCREEN_GLES_GetProcAddress;
+    device->GL_GetSwapInterval = OFFSCREEN_GLES_GetSwapInterval;
+    device->GL_SetSwapInterval = OFFSCREEN_GLES_SetSwapInterval;
+#endif
 
     /* "Window" */
     device->CreateSDLWindow = OFFSCREEN_CreateWindow;
@@ -106,7 +104,6 @@ int
 OFFSCREEN_VideoInit(_THIS)
 {
     SDL_DisplayMode mode;
-    SDL_Mouse *mouse = NULL;
 
     /* Use a fake 32-bpp desktop mode */
     mode.format = SDL_PIXELFORMAT_RGB888;
diff --git a/src/video/offscreen/SDL_offscreenvideo.h b/src/video/offscreen/SDL_offscreenvideo.h
index eae512b..b943a82 100644
--- a/src/video/offscreen/SDL_offscreenvideo.h
+++ b/src/video/offscreen/SDL_offscreenvideo.h
@@ -18,14 +18,12 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #ifndef _SDL_offscreenvideo_h
 #define _SDL_offscreenvideo_h
 
 #include "../SDL_sysvideo.h"
-#include "../SDL_egl_c.h"
 
 #endif /* _SDL_offscreenvideo_h */
 
diff --git a/src/video/offscreen/SDL_offscreenwindow.c b/src/video/offscreen/SDL_offscreenwindow.c
index 6697b01..1730308 100644
--- a/src/video/offscreen/SDL_offscreenwindow.c
+++ b/src/video/offscreen/SDL_offscreenwindow.c
@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../../SDL_internal.h"
 
 #if SDL_VIDEO_DRIVER_OFFSCREEN
@@ -31,7 +30,7 @@
 int
 OFFSCREEN_CreateWindow(_THIS, SDL_Window* window)
 {
-    OFFSCREEN_Window* offscreen_window = SDL_calloc(1, sizeof(OFFSCREEN_Window));
+    OFFSCREEN_Window *offscreen_window = SDL_calloc(1, sizeof(OFFSCREEN_Window));
 
     if (!offscreen_window) {
         return SDL_OutOfMemory();
@@ -49,6 +48,7 @@ OFFSCREEN_CreateWindow(_THIS, SDL_Window* window)
 
     offscreen_window->sdl_window = window;
 
+#if SDL_VIDEO_OPENGL_EGL
     if (window->flags & SDL_WINDOW_OPENGL) {
 
         if (!_this->egl_data) {
@@ -61,10 +61,10 @@ OFFSCREEN_CreateWindow(_THIS, SDL_Window* window)
             return SDL_SetError("Failed to created an offscreen surface (EGL display: %p)",
                                 _this->egl_data->egl_display);
         }
-    }
-    else {
+    } else {
         offscreen_window->egl_surface = EGL_NO_SURFACE;
     }
+#endif /* SDL_VIDEO_OPENGL_EGL */
 
     return 0;
 }
@@ -75,7 +75,9 @@ OFFSCREEN_DestroyWindow(_THIS, SDL_Window* window)
     OFFSCREEN_Window* offscreen_window = window->driverdata;
 
     if (offscreen_window) {
+#if SDL_VIDEO_OPENGL_EGL
         SDL_EGL_DestroySurface(_this, offscreen_window->egl_surface);
+#endif
         SDL_free(offscreen_window);
     }
 
diff --git a/src/video/offscreen/SDL_offscreenwindow.h b/src/video/offscreen/SDL_offscreenwindow.h
index 74c85d2..5540794 100644
--- a/src/video/offscreen/SDL_offscreenwindow.h
+++ b/src/video/offscreen/SDL_offscreenwindow.h
@@ -18,27 +18,24 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "../../SDL_internal.h"
 
 #ifndef _SDL_offscreenwindow_h
 #define _SDL_offscreenwindow_h
 
-#include "../SDL_sysvideo.h"
-#include "SDL_syswm.h"
-
 #include "SDL_offscreenvideo.h"
 
 typedef struct {
     SDL_Window* sdl_window;
+#if SDL_VIDEO_OPENGL_EGL
     EGLSurface egl_surface;
+#endif
 
 } OFFSCREEN_Window;
 
 
-extern int
-OFFSCREEN_CreateWindow(_THIS, SDL_Window* window);
-
-extern void
-OFFSCREEN_DestroyWindow(_THIS, SDL_Window* window);
+extern int OFFSCREEN_CreateWindow(_THIS, SDL_Window *window);
+extern void OFFSCREEN_DestroyWindow(_THIS, SDL_Window *window);
 
 #endif /* _SDL_offscreenwindow */