diff --git a/build-scripts/SDL_migration.cocci b/build-scripts/SDL_migration.cocci index 019b2ecdf4..d8b30b31c3 100644 --- a/build-scripts/SDL_migration.cocci +++ b/build-scripts/SDL_migration.cocci @@ -3715,3 +3715,15 @@ typedef SDL_bool, bool; @@ - SDL_BUTTON + SDL_BUTTON_MASK +@@ +@@ +- SDL_GLprofile ++ SDL_GLProfile +@@ +@@ +- SDL_GLcontextFlag ++ SDL_GLContextFlag +@@ +@@ +- SDL_GLcontextReleaseFlag ++ SDL_GLContextReleaseFlag diff --git a/docs/README-migration.md b/docs/README-migration.md index 0715181abc..3f93c55196 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -2229,6 +2229,9 @@ The following symbols have been renamed: * SDL_DISPLAYEVENT_DISCONNECTED => SDL_EVENT_DISPLAY_REMOVED * SDL_DISPLAYEVENT_MOVED => SDL_EVENT_DISPLAY_MOVED * SDL_DISPLAYEVENT_ORIENTATION => SDL_EVENT_DISPLAY_ORIENTATION +* SDL_GLcontextFlag => SDL_GLContextFlag +* SDL_GLcontextReleaseFlag => SDL_GLContextReleaseFlag +* SDL_GLprofile => SDL_GLProfile * SDL_WINDOWEVENT_CLOSE => SDL_EVENT_WINDOW_CLOSE_REQUESTED * SDL_WINDOWEVENT_DISPLAY_CHANGED => SDL_EVENT_WINDOW_DISPLAY_CHANGED * SDL_WINDOWEVENT_ENTER => SDL_EVENT_WINDOW_MOUSE_ENTER diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h index af79416866..d25337027c 100644 --- a/include/SDL3/SDL_oldnames.h +++ b/include/SDL3/SDL_oldnames.h @@ -659,6 +659,9 @@ /* ##SDL_video.h */ #define SDL_GL_DeleteContext SDL_GL_DestroyContext +#define SDL_GLcontextFlag SDL_GLContextFlag +#define SDL_GLcontextReleaseFlag SDL_GLContextReleaseFlag +#define SDL_GLprofile SDL_GLProfile #define SDL_GetClosestDisplayMode SDL_GetClosestFullscreenDisplayMode #define SDL_GetDisplayOrientation SDL_GetCurrentDisplayOrientation #define SDL_GetPointDisplayIndex SDL_GetDisplayForPoint @@ -1297,6 +1300,9 @@ /* ##SDL_video.h */ #define SDL_GL_DeleteContext SDL_GL_DeleteContext_renamed_SDL_GL_DestroyContext +#define SDL_GLcontextFlag SDL_GLcontextFlag_renamed_SDL_GLContextFlag +#define SDL_GLcontextReleaseFlag SDL_GLcontextReleaseFlag_renamed_SDL_GLContextReleaseFlag +#define SDL_GLprofile SDL_GLprofile_renamed_SDL_GLProfile #define SDL_GetClosestDisplayMode SDL_GetClosestDisplayMode_renamed_SDL_GetClosestFullscreenDisplayMode #define SDL_GetDisplayOrientation SDL_GetDisplayOrientation_renamed_SDL_GetCurrentDisplayOrientation #define SDL_GetPointDisplayIndex SDL_GetPointDisplayIndex_renamed_SDL_GetDisplayForPoint diff --git a/include/SDL3/SDL_video.h b/include/SDL3/SDL_video.h index 18b370025c..0134bb15bf 100644 --- a/include/SDL3/SDL_video.h +++ b/include/SDL3/SDL_video.h @@ -353,11 +353,11 @@ typedef enum SDL_GLattr SDL_GL_RETAINED_BACKING, /**< not used (deprecated). */ SDL_GL_CONTEXT_MAJOR_VERSION, /**< OpenGL context major version. */ SDL_GL_CONTEXT_MINOR_VERSION, /**< OpenGL context minor version. */ - SDL_GL_CONTEXT_FLAGS, /**< some combination of 0 or more of elements of the SDL_GLcontextFlag enumeration; defaults to 0. */ - SDL_GL_CONTEXT_PROFILE_MASK, /**< type of GL context (Core, Compatibility, ES). See SDL_GLprofile; default value depends on platform. */ + SDL_GL_CONTEXT_FLAGS, /**< some combination of 0 or more of elements of the SDL_GLContextFlag enumeration; defaults to 0. */ + SDL_GL_CONTEXT_PROFILE_MASK, /**< type of GL context (Core, Compatibility, ES). See SDL_GLProfile; default value depends on platform. */ SDL_GL_SHARE_WITH_CURRENT_CONTEXT, /**< OpenGL context sharing; defaults to 0. */ SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, /**< requests sRGB capable visual; defaults to 0. */ - SDL_GL_CONTEXT_RELEASE_BEHAVIOR, /**< sets context the release behavior. See SDL_GLcontextReleaseFlag; defaults to FLUSH. */ + SDL_GL_CONTEXT_RELEASE_BEHAVIOR, /**< sets context the release behavior. See SDL_GLContextReleaseFlag; defaults to FLUSH. */ SDL_GL_CONTEXT_RESET_NOTIFICATION, /**< set context reset notification. See SDL_GLContextResetNotification; defaults to NO_NOTIFICATION. */ SDL_GL_CONTEXT_NO_ERROR, SDL_GL_FLOATBUFFERS, @@ -369,7 +369,7 @@ typedef enum SDL_GLattr * * \since This datatype is available since SDL 3.1.3. */ -typedef Uint32 SDL_GLprofile; +typedef Uint32 SDL_GLProfile; #define SDL_GL_CONTEXT_PROFILE_CORE 0x0001 /**< OpenGL Core Profile context */ #define SDL_GL_CONTEXT_PROFILE_COMPATIBILITY 0x0002 /**< OpenGL Compatibility Profile context */ @@ -381,7 +381,7 @@ typedef Uint32 SDL_GLprofile; * * \since This datatype is available since SDL 3.1.3. */ -typedef Uint32 SDL_GLcontextFlag; +typedef Uint32 SDL_GLContextFlag; #define SDL_GL_CONTEXT_DEBUG_FLAG 0x0001 #define SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG 0x0002 @@ -395,7 +395,7 @@ typedef Uint32 SDL_GLcontextFlag; * * \since This datatype is available since SDL 3.1.3. */ -typedef Uint32 SDL_GLcontextReleaseFlag; +typedef Uint32 SDL_GLContextReleaseFlag; #define SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE 0x0000 #define SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x0001