VITA: Remove unused/duplicate headers

src/video/vita/SDL_vitagl_pvr.c

@@ -29,7 +29,6 @@
 
 #include "SDL_vitavideo.h"
 #include "../SDL_egl_c.h"
-#include "SDL_vitagl_pvr_c.h"
 
 #define MAX_PATH 256 // vita limits are somehow wrong
 

src/video/vita/SDL_vitagl_pvr_c.h

@@ -1,31 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2025 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_vitagl_pvr_c_h_
-#define SDL_vitagl_pvr_c_h_
-
-#include "SDL_vitavideo.h"
-
-extern SDL_GLContext VITA_GL_CreateContext(SDL_VideoDevice *_this, SDL_Window *window);
-extern int VITA_GL_LoadLibrary(SDL_VideoDevice *_this, const char *path);
-extern SDL_FunctionPointer VITA_GL_GetProcAddress(SDL_VideoDevice *_this, const char *proc);
-
-#endif // SDL_vitagl_pvr_c_h_

src/video/vita/SDL_vitagles.c

@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "SDL_vitavideo.h"
-#include "SDL_vitagles_c.h"
 
 /*****************************************************************************/
 // SDL OpenGL/OpenGL ES functions

src/video/vita/SDL_vitagles_c.h

@@ -1,53 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2025 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_vitagles_c_h_
-#define SDL_vitagles_c_h_
-
-#include <pib.h>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#include "SDL_vitavideo.h"
-
-typedef struct SDL_GLDriverData
-{
-    EGLDisplay display;
-    EGLContext context;
-    EGLSurface surface;
-    uint32_t swapinterval;
-} SDL_GLDriverData;
-
-extern SDL_FunctionPointer VITA_GLES_GetProcAddress(SDL_VideoDevice *_this, const char *proc);
-extern bool VITA_GLES_MakeCurrent(SDL_VideoDevice *_this, SDL_Window *window, SDL_GLContext context);
-extern void VITA_GLES_SwapBuffers(SDL_VideoDevice *_this);
-
-extern bool VITA_GLES_SwapWindow(SDL_VideoDevice *_this, SDL_Window *window);
-extern SDL_GLContext VITA_GLES_CreateContext(SDL_VideoDevice *_this, SDL_Window *window);
-
-extern bool VITA_GLES_LoadLibrary(SDL_VideoDevice *_this, const char *path);
-extern void VITA_GLES_UnloadLibrary(SDL_VideoDevice *_this);
-extern bool VITA_GLES_SetSwapInterval(SDL_VideoDevice *_this, int interval);
-extern bool VITA_GLES_GetSwapInterval(SDL_VideoDevice *_this, int *interval);
-
-#endif // SDL_vitagles_c_h_

src/video/vita/SDL_vitagles_pvr.c

@@ -28,7 +28,6 @@
 
 #include "SDL_vitavideo.h"
 #include "../SDL_egl_c.h"
-#include "SDL_vitagles_pvr_c.h"
 
 #define MAX_PATH 256 // vita limits are somehow wrong
 

src/video/vita/SDL_vitagles_pvr_c.h

@@ -1,32 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2025 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_vitagles_pvr_c_h_
-#define SDL_vitagles_pvr_c_h_
-
-#include "SDL_vitavideo.h"
-
-extern bool VITA_GLES_MakeCurrent(SDL_VideoDevice *_this, SDL_Window *window, SDL_GLContext context);
-extern bool VITA_GLES_SwapWindow(SDL_VideoDevice *_this, SDL_Window *window);
-extern SDL_GLContext VITA_GLES_CreateContext(SDL_VideoDevice *_this, SDL_Window *window);
-extern bool VITA_GLES_LoadLibrary(SDL_VideoDevice *_this, const char *path);
-
-#endif // SDL_vitagles_pvr_c_h_

src/video/vita/SDL_vitavideo.c

@@ -37,13 +37,7 @@
 #include "SDL_vitaframebuffer.h"
 #include "SDL_vitamessagebox.h"
 
-#ifdef SDL_VIDEO_VITA_PIB
-#include "SDL_vitagles_c.h"
-#elif defined(SDL_VIDEO_VITA_PVR)
-#include "SDL_vitagles_pvr_c.h"
-#ifdef SDL_VIDEO_VITA_PVR_OGL
-#include "SDL_vitagl_pvr_c.h"
-#endif
+#if defined(SDL_VIDEO_VITA_PVR)
 #define VITA_GLES_GetProcAddress  SDL_EGL_GetProcAddressInternal
 #define VITA_GLES_UnloadLibrary   SDL_EGL_UnloadLibrary
 #define VITA_GLES_SetSwapInterval SDL_EGL_SetSwapInterval

src/video/vita/SDL_vitavideo.h

@@ -31,6 +31,23 @@
 #include <psp2/ime_dialog.h>
 #include <psp2/sysmodule.h>
 
+#ifdef SDL_VIDEO_VITA_PIB
+#include <psp2/gxm.h>
+#include <psp2/display.h>
+#include <pib.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+typedef struct SDL_GLDriverData
+{
+    EGLDisplay display;
+    EGLContext context;
+    EGLSurface surface;
+    uint32_t swapinterval;
+} SDL_GLDriverData;
+#endif
+
 struct SDL_VideoData
 {
     bool egl_initialized; // OpenGL device initialization status