mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-29 10:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the SDL3 surface ABI compatible with SDL2

Browse Source 
We'll use properties for new data associated with a surface, which lets us preserve ABI compatibility with SDL2 and any surfaces created by applications and passed in to SDL functions.
This commit is contained in:
Sam Lantinga
2023-12-20 17:35:43 -08:00
parent f72d6a7fd9
commit 2ad50e9675
2 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/SDL3/SDL_surface.h
View File

@@ -50,11 +50,12 @@ extern "C" {
* Used internally (read-only).
*/
/* @{ */
#define SDL_SWSURFACE 0 /**< Just here for compatibility */
#define SDL_PREALLOC 0x00000001 /**< Surface uses preallocated memory */
#define SDL_RLEACCEL 0x00000002 /**< Surface is RLE encoded */
#define SDL_DONTFREE 0x00000004 /**< Surface is referenced internally */
#define SDL_SIMD_ALIGNED 0x00000008 /**< Surface uses aligned memory */
#define SDL_SWSURFACE 0 /**< Just here for compatibility */
#define SDL_PREALLOC 0x00000001 /**< Surface uses preallocated memory */
#define SDL_RLEACCEL 0x00000002 /**< Surface is RLE encoded */
#define SDL_DONTFREE 0x00000004 /**< Surface is referenced internally */
#define SDL_SIMD_ALIGNED 0x00000008 /**< Surface uses aligned memory */
#define SDL_SURFACE_USES_PROPERTIES 0x00000010 /**< Surface uses properties */
/* @} *//* Surface flags */
/**
@@ -104,7 +105,10 @@ typedef struct SDL_Surface
void *pixels; /**< Read-write */
/** Application data associated with the surface */
SDL_PropertiesID props; /**< Read-write */
union {
void *reserved; /**< For ABI compatibility only, do not use */
SDL_PropertiesID props; /**< Read-only */
};
/** information needed for surfaces requiring locks */
int locked; /**< Read-only */
@@ -115,8 +119,6 @@ typedef struct SDL_Surface
/** clipping information */
SDL_Rect clip_rect; /**< Read-only */
SDL_ScaleMode scaleMode; /**< The scale mode */
/** info for fast blit mapping to other surfaces */
SDL_BlitMap *map; /**< Private */