From efaafd766e0cc56c0bb2fa157fd4d545ae6d77cb Mon Sep 17 00:00:00 2001
From: Ivan Epifanov <[EMAIL REDACTED]>
Date: Wed, 12 Mar 2025 13:00:19 +0300
Subject: [PATCH] VITA: Remove unused/duplicate headers
---
src/video/vita/SDL_vitagl_pvr.c | 1 -
src/video/vita/SDL_vitagl_pvr_c.h | 31 -----------------
src/video/vita/SDL_vitagles.c | 1 -
src/video/vita/SDL_vitagles_c.h | 53 -----------------------------
src/video/vita/SDL_vitagles_pvr.c | 1 -
src/video/vita/SDL_vitagles_pvr_c.h | 32 -----------------
src/video/vita/SDL_vitavideo.c | 8 +----
src/video/vita/SDL_vitavideo.h | 17 +++++++++
8 files changed, 18 insertions(+), 126 deletions(-)
delete mode 100644 src/video/vita/SDL_vitagl_pvr_c.h
delete mode 100644 src/video/vita/SDL_vitagles_c.h
delete mode 100644 src/video/vita/SDL_vitagles_pvr_c.h
diff --git a/src/video/vita/SDL_vitagl_pvr.c b/src/video/vita/SDL_vitagl_pvr.c
index 1255e4e9de39f..c5d7df339f437 100644
--- a/src/video/vita/SDL_vitagl_pvr.c
+++ b/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
diff --git a/src/video/vita/SDL_vitagl_pvr_c.h b/src/video/vita/SDL_vitagl_pvr_c.h
deleted file mode 100644
index 118602d6127b1..0000000000000
--- a/src/video/vita/SDL_vitagl_pvr_c.h
+++ /dev/null
@@ -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_
diff --git a/src/video/vita/SDL_vitagles.c b/src/video/vita/SDL_vitagles.c
index 2c7444781bc0c..d3fcd6ad380c2 100644
--- a/src/video/vita/SDL_vitagles.c
+++ b/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
diff --git a/src/video/vita/SDL_vitagles_c.h b/src/video/vita/SDL_vitagles_c.h
deleted file mode 100644
index 44cb14d6573ae..0000000000000
--- a/src/video/vita/SDL_vitagles_c.h
+++ /dev/null
@@ -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_
diff --git a/src/video/vita/SDL_vitagles_pvr.c b/src/video/vita/SDL_vitagles_pvr.c
index 4ba0573dc5c82..bf4721e3a54f3 100644
--- a/src/video/vita/SDL_vitagles_pvr.c
+++ b/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
diff --git a/src/video/vita/SDL_vitagles_pvr_c.h b/src/video/vita/SDL_vitagles_pvr_c.h
deleted file mode 100644
index ad87212bc29e0..0000000000000
--- a/src/video/vita/SDL_vitagles_pvr_c.h
+++ /dev/null
@@ -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_
diff --git a/src/video/vita/SDL_vitavideo.c b/src/video/vita/SDL_vitavideo.c
index 6b5dbd78d017f..a4e6ca3f23e6e 100644
--- a/src/video/vita/SDL_vitavideo.c
+++ b/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
diff --git a/src/video/vita/SDL_vitavideo.h b/src/video/vita/SDL_vitavideo.h
index 268bed84aea7c..7b9a78fb90bee 100644
--- a/src/video/vita/SDL_vitavideo.h
+++ b/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