From 66011e497db17728d50ba71254a7fca1c2e57220 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 23 Jul 2024 12:58:20 -0700 Subject: [PATCH] Removed duplication in SDL_EGL_* function names --- include/SDL3/SDL_video.h | 10 +++++----- src/dynapi/SDL_dynapi.sym | 8 ++++---- src/dynapi/SDL_dynapi_overrides.h | 8 ++++---- src/dynapi/SDL_dynapi_procs.h | 8 ++++---- src/dynapi/gendynapi.py | 2 +- src/video/SDL_video.c | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/SDL3/SDL_video.h b/include/SDL3/SDL_video.h index 9e733e52f2..2d3769ef99 100644 --- a/include/SDL3/SDL_video.h +++ b/include/SDL3/SDL_video.h @@ -2522,7 +2522,7 @@ extern SDL_DECLSPEC SDL_FunctionPointer SDLCALL SDL_GL_GetProcAddress(const char * * \since This function is available since SDL 3.0.0. * - * \sa SDL_EGL_GetCurrentEGLDisplay + * \sa SDL_EGL_GetCurrentDisplay */ extern SDL_DECLSPEC SDL_FunctionPointer SDLCALL SDL_EGL_GetProcAddress(const char *proc); @@ -2671,7 +2671,7 @@ extern SDL_DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_EGLDisplay SDLCALL SDL_EGL_GetCurrentEGLDisplay(void); +extern SDL_DECLSPEC SDL_EGLDisplay SDLCALL SDL_EGL_GetCurrentDisplay(void); /** * Get the currently active EGL config. @@ -2681,7 +2681,7 @@ extern SDL_DECLSPEC SDL_EGLDisplay SDLCALL SDL_EGL_GetCurrentEGLDisplay(void); * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_EGLConfig SDLCALL SDL_EGL_GetCurrentEGLConfig(void); +extern SDL_DECLSPEC SDL_EGLConfig SDLCALL SDL_EGL_GetCurrentConfig(void); /** * Get the EGL surface associated with the window. @@ -2692,7 +2692,7 @@ extern SDL_DECLSPEC SDL_EGLConfig SDLCALL SDL_EGL_GetCurrentEGLConfig(void); * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC SDL_EGLSurface SDLCALL SDL_EGL_GetWindowEGLSurface(SDL_Window *window); +extern SDL_DECLSPEC SDL_EGLSurface SDLCALL SDL_EGL_GetWindowSurface(SDL_Window *window); /** * Sets the callbacks for defining custom EGLAttrib arrays for EGL @@ -2716,7 +2716,7 @@ extern SDL_DECLSPEC SDL_EGLSurface SDLCALL SDL_EGL_GetWindowEGLSurface(SDL_Windo * * \since This function is available since SDL 3.0.0. */ -extern SDL_DECLSPEC void SDLCALL SDL_EGL_SetEGLAttributeCallbacks(SDL_EGLAttribArrayCallback platformAttribCallback, +extern SDL_DECLSPEC void SDLCALL SDL_EGL_SetAttributeCallbacks(SDL_EGLAttribArrayCallback platformAttribCallback, SDL_EGLIntArrayCallback surfaceAttribCallback, SDL_EGLIntArrayCallback contextAttribCallback); diff --git a/src/dynapi/SDL_dynapi.sym b/src/dynapi/SDL_dynapi.sym index 5b9b1722e7..5b3b825566 100644 --- a/src/dynapi/SDL_dynapi.sym +++ b/src/dynapi/SDL_dynapi.sym @@ -110,11 +110,11 @@ SDL3_0.0.0 { SDL_DetachVirtualJoystick; SDL_DisableScreenSaver; SDL_DuplicateSurface; - SDL_EGL_GetCurrentEGLConfig; - SDL_EGL_GetCurrentEGLDisplay; + SDL_EGL_GetCurrentConfig; + SDL_EGL_GetCurrentDisplay; SDL_EGL_GetProcAddress; - SDL_EGL_GetWindowEGLSurface; - SDL_EGL_SetEGLAttributeCallbacks; + SDL_EGL_GetWindowSurface; + SDL_EGL_SetAttributeCallbacks; SDL_EnableScreenSaver; SDL_EnterAppMainCallbacks; SDL_EnumerateDirectory; diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index 278310dc15..22d210e9f0 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -135,11 +135,11 @@ #define SDL_DetachVirtualJoystick SDL_DetachVirtualJoystick_REAL #define SDL_DisableScreenSaver SDL_DisableScreenSaver_REAL #define SDL_DuplicateSurface SDL_DuplicateSurface_REAL -#define SDL_EGL_GetCurrentEGLConfig SDL_EGL_GetCurrentEGLConfig_REAL -#define SDL_EGL_GetCurrentEGLDisplay SDL_EGL_GetCurrentEGLDisplay_REAL +#define SDL_EGL_GetCurrentConfig SDL_EGL_GetCurrentConfig_REAL +#define SDL_EGL_GetCurrentDisplay SDL_EGL_GetCurrentDisplay_REAL #define SDL_EGL_GetProcAddress SDL_EGL_GetProcAddress_REAL -#define SDL_EGL_GetWindowEGLSurface SDL_EGL_GetWindowEGLSurface_REAL -#define SDL_EGL_SetEGLAttributeCallbacks SDL_EGL_SetEGLAttributeCallbacks_REAL +#define SDL_EGL_GetWindowSurface SDL_EGL_GetWindowSurface_REAL +#define SDL_EGL_SetAttributeCallbacks SDL_EGL_SetAttributeCallbacks_REAL #define SDL_EnableScreenSaver SDL_EnableScreenSaver_REAL #define SDL_EnterAppMainCallbacks SDL_EnterAppMainCallbacks_REAL #define SDL_EnumerateDirectory SDL_EnumerateDirectory_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 95ebe6753e..c7264154bf 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -155,11 +155,11 @@ SDL_DYNAPI_PROC(void,SDL_DetachThread,(SDL_Thread *a),(a),) SDL_DYNAPI_PROC(int,SDL_DetachVirtualJoystick,(SDL_JoystickID a),(a),return) SDL_DYNAPI_PROC(int,SDL_DisableScreenSaver,(void),(),return) SDL_DYNAPI_PROC(SDL_Surface*,SDL_DuplicateSurface,(SDL_Surface *a),(a),return) -SDL_DYNAPI_PROC(SDL_EGLConfig,SDL_EGL_GetCurrentEGLConfig,(void),(),return) -SDL_DYNAPI_PROC(SDL_EGLDisplay,SDL_EGL_GetCurrentEGLDisplay,(void),(),return) +SDL_DYNAPI_PROC(SDL_EGLConfig,SDL_EGL_GetCurrentConfig,(void),(),return) +SDL_DYNAPI_PROC(SDL_EGLDisplay,SDL_EGL_GetCurrentDisplay,(void),(),return) SDL_DYNAPI_PROC(SDL_FunctionPointer,SDL_EGL_GetProcAddress,(const char *a),(a),return) -SDL_DYNAPI_PROC(SDL_EGLSurface,SDL_EGL_GetWindowEGLSurface,(SDL_Window *a),(a),return) -SDL_DYNAPI_PROC(void,SDL_EGL_SetEGLAttributeCallbacks,(SDL_EGLAttribArrayCallback a, SDL_EGLIntArrayCallback b, SDL_EGLIntArrayCallback c),(a,b,c),) +SDL_DYNAPI_PROC(SDL_EGLSurface,SDL_EGL_GetWindowSurface,(SDL_Window *a),(a),return) +SDL_DYNAPI_PROC(void,SDL_EGL_SetAttributeCallbacks,(SDL_EGLAttribArrayCallback a, SDL_EGLIntArrayCallback b, SDL_EGLIntArrayCallback c),(a,b,c),) SDL_DYNAPI_PROC(int,SDL_EnableScreenSaver,(void),(),return) SDL_DYNAPI_PROC(int,SDL_EnterAppMainCallbacks,(int a, char *b[], SDL_AppInit_func c, SDL_AppIterate_func d, SDL_AppEvent_func e, SDL_AppQuit_func f),(a,b,c,d,e,f),return) SDL_DYNAPI_PROC(int,SDL_EnumerateDirectory,(const char *a, SDL_EnumerateDirectoryCallback b, void *c),(a,b,c),return) diff --git a/src/dynapi/gendynapi.py b/src/dynapi/gendynapi.py index 09129c0ee5..fb601af9df 100755 --- a/src/dynapi/gendynapi.py +++ b/src/dynapi/gendynapi.py @@ -482,7 +482,7 @@ def add_dyn_api(proc): # File: SDL_dynapi_procs.h # # Add at last - # SDL_DYNAPI_PROC(SDL_EGLConfig,SDL_EGL_GetCurrentEGLConfig,(void),(),return) + # SDL_DYNAPI_PROC(SDL_EGLConfig,SDL_EGL_GetCurrentConfig,(void),(),return) f = open(SDL_DYNAPI_PROCS_H, "a", newline="") dyn_proc = "SDL_DYNAPI_PROC(" + func_ret + "," + func_name + ",(" diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index d50af934d3..5f0caba9b5 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -4327,7 +4327,7 @@ void SDL_GL_DeduceMaxSupportedESProfile(int *major, int *minor) #endif } -void SDL_EGL_SetEGLAttributeCallbacks(SDL_EGLAttribArrayCallback platformAttribCallback, +void SDL_EGL_SetAttributeCallbacks(SDL_EGLAttribArrayCallback platformAttribCallback, SDL_EGLIntArrayCallback surfaceAttribCallback, SDL_EGLIntArrayCallback contextAttribCallback) { @@ -4849,7 +4849,7 @@ SDL_GLContext SDL_GL_GetCurrentContext(void) return (SDL_GLContext)SDL_GetTLS(&_this->current_glctx_tls); } -SDL_EGLDisplay SDL_EGL_GetCurrentEGLDisplay(void) +SDL_EGLDisplay SDL_EGL_GetCurrentDisplay(void) { #ifdef SDL_VIDEO_OPENGL_EGL if (!_this) { @@ -4867,7 +4867,7 @@ SDL_EGLDisplay SDL_EGL_GetCurrentEGLDisplay(void) #endif } -SDL_EGLConfig SDL_EGL_GetCurrentEGLConfig(void) +SDL_EGLConfig SDL_EGL_GetCurrentConfig(void) { #ifdef SDL_VIDEO_OPENGL_EGL if (!_this) { @@ -4885,7 +4885,7 @@ SDL_EGLConfig SDL_EGL_GetCurrentEGLConfig(void) #endif } -SDL_EGLConfig SDL_EGL_GetWindowEGLSurface(SDL_Window *window) +SDL_EGLConfig SDL_EGL_GetWindowSurface(SDL_Window *window) { #ifdef SDL_VIDEO_OPENGL_EGL if (!_this) {