Sync branch 'enums-as-seperate-integer-types-instead-of-aliases' with 'master'

Merge conflicts:
- sdlblendmode.inc

Author: suve

README.md

@@ -1,21 +1,33 @@
-# Pascal-SDL-2-Headers
+# SDL2-for-Pascal
 
-These are the Pascal SDL 2 Headers.
+Unit files for building
+[Free Pascal](https://freepascal.org/) / [Delphi](https://www.embarcadero.com/products/delphi) applications
+using the [SDL2 library](https://libsdl.org).
+
+This repository is a community-maintained fork of the [Pascal-SDL-2-Headers](https://github.com/ev1313/Pascal-SDL-2-Headers) repo.
 
 ## Installation
 
-Just add the headers to your include path. Include sdl2.pas for the main SDL2 library (should be always needed). Furthermore headers for the other SDL2 libraries are provided: 
- - sdl2_image.pas
- - sdl2_mixer.pas
- - sdl2_net.pas
- - sdl2_ttf.pas
+Simply add the units to your include path. You can achieve this by:
+ - (FPC) using the `{$UNITPATH XXX}` directive in your source code;
+ - (FPC) using the `-FuXXX` command-line argument to the compiler;
+ - just copying & pasting the units into the same directory as your main source code.
+
+Use the `sdl2` unit for the main SDL2 library (should be always needed). Units for the other SDL2 libraries are also provided:
+ - [`sdl2_gfx`](https://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/)
+ - [`sdl2_image`](https://www.libsdl.org/projects/SDL_image/)
+ - [`sdl2_mixer`](https://www.libsdl.org/projects/SDL_mixer/)
+ - [`sdl2_net`](https://www.libsdl.org/projects/SDL_net/)
+ - [`sdl2_ttf`](https://www.libsdl.org/projects/SDL_ttf/)
 
 ## Bugs / Contributions
 
 If you have any contributions, feel free to drop a pull request or send in a patch.
 
-Same goes for bugs, please use the github issue tracker.
+Same goes for bugs, please use the GitHub issue tracker.
 
 ## License
 
-You may license the Pascal SDL 2 Headers either with the MPL license or with the zlib license, both included.
+You may license the Pascal SDL2 units either
+with the [MPL license](blob/master/MPL-LICENSE) or
+with the [zlib license](blob/master/zlib-LICENSE).

sdl2.pas

@@ -208,6 +208,7 @@ interface
 {$I sdlfilesystem.inc}
 {$I sdllog.inc}
 {$I sdlsystem.inc}
+{$I sdlstdinc.inc}
 {$I sdl.inc}
 
 implementation

sdlblendmode.inc

@@ -13,3 +13,48 @@ const
   SDL_BLENDMODE_BLEND = TSDL_BlendMode($00000001);    {**< dst = (src * A) + (dst * (1-A)) *}
   SDL_BLENDMODE_ADD   = TSDL_BlendMode($00000002);    {**< dst = (src * A) + dst *}
   SDL_BLENDMODE_MOD   = TSDL_BlendMode($00000004);    {**< dst = src * dst *}
+
+type
+  PSDL_BlendOperation = ^TSDL_BlendOperation;
+  TSDL_BlendOperation = type DWord;
+
+const
+  SDL_BLENDOPERATION_ADD              = TSDL_BlendOperation($1);  {**< dst + src: supported by all renderers *}
+  SDL_BLENDOPERATION_SUBTRACT         = TSDL_BlendOperation($2);  {**< dst - src : supported by D3D9, D3D11, OpenGL, OpenGLES}
+  SDL_BLENDOPERATION_REV_SUBTRACT     = TSDL_BlendOperation($3);  {**< src - dst : supported by D3D9, D3D11, OpenGL, OpenGLES}
+  SDL_BLENDOPERATION_MINIMUM          = TSDL_BlendOperation($4);  {**< min(dst, src) : supported by D3D11 *}
+  SDL_BLENDOPERATION_MAXIMUM          = TSDL_BlendOperation($5);  {**< max(dst, src) : supported by D3D11 *}
+
+type
+  PSDL_BlendFactor = ^TSDL_BlendFactor;
+  TSDL_BlendFactor = type DWord;
+
+const
+  SDL_BLENDFACTOR_ZERO                = TSDL_BlendFactor($1);  {**< 0, 0, 0, 0 *}
+  SDL_BLENDFACTOR_ONE                 = TSDL_BlendFactor($2);  {**< 1, 1, 1, 1 *}
+  SDL_BLENDFACTOR_SRC_COLOR           = TSDL_BlendFactor($3);  {**< srcR, srcG, srcB, srcA *}
+  SDL_BLENDFACTOR_ONE_MINUS_SRC_COLOR = TSDL_BlendFactor($4);  {**< 1-srcR, 1-srcG, 1-srcB, 1-srcA *}
+  SDL_BLENDFACTOR_SRC_ALPHA           = TSDL_BlendFactor($5);  {**< srcA, srcA, srcA, srcA *}
+  SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA = TSDL_BlendFactor($6);  {**< 1-srcA, 1-srcA, 1-srcA, 1-srcA *}
+  SDL_BLENDFACTOR_DST_COLOR           = TSDL_BlendFactor($7);  {**< dstR, dstG, dstB, dstA *}
+  SDL_BLENDFACTOR_ONE_MINUS_DST_COLOR = TSDL_BlendFactor($8);  {**< 1-dstR, 1-dstG, 1-dstB, 1-dstA *}
+  SDL_BLENDFACTOR_DST_ALPHA           = TSDL_BlendFactor($9);  {**< dstA, dstA, dstA, dstA *}
+  SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA = TSDL_BlendFactor($A);  {**< 1-dstA, 1-dstA, 1-dstA, 1-dstA *}
+
+{**
+ *  \brief Create a custom blend mode, which may or may not be supported by a given renderer
+ *
+ *  \param srcColorFactor source color factor
+ *  \param dstColorFactor destination color factor
+ *  \param colorOperation color operation
+ *  \param srcAlphaFactor source alpha factor
+ *  \param dstAlphaFactor destination alpha factor
+ *  \param alphaOperation alpha operation
+ *
+ *  The result of the blend mode operation will be:
+ *      dstRGB = dstRGB * dstColorFactor colorOperation srcRGB * srcColorFactor
+ *  and
+ *      dstA = dstA * dstAlphaFactor alphaOperation srcA * srcAlphaFactor
+ *}
+Function SDL_ComposeCustomBlendMode(srcColorFactor, dstColorFactor : TSDL_BlendFactor; colorOperation : TSDL_BlendOperation; srcAlphaFactor, dstAlphaFactor : TSDL_BlendFactor; alphaOperation : TSDL_BlendOperation) : TSDL_BlendMode cdecl;
+  external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_ComposeCustomBlendMode' {$ENDIF} {$ENDIF};

sdlrenderer.inc

@@ -771,5 +771,5 @@ function SDL_GL_UnbindTexture(texture: PSDL_Texture): SInt32 cdecl; external SDL
    *  a contiguous block of Y and U/V planes in the proper order, but
    *  this function is available if your pixel data is not contiguous.
    *}
-function SDL_UpdateYUVTexture(texture: PSDL_Texture; rect: PSDL_Rect; Yplane: PUInt8; Ypitch: SInt32; Uplane: PUInt8; UPitch: SInt32; Vplane: UInt8; VPitch: SInt32):SInt32;
+function SDL_UpdateYUVTexture(texture: PSDL_Texture; rect: PSDL_Rect; Yplane: PUInt8; Ypitch: SInt32; Uplane: PUInt8; UPitch: SInt32; Vplane: PUInt8; VPitch: SInt32):SInt32;
    cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_UpdateYUVTexture' {$ENDIF} {$ENDIF};

sdlstdinc.inc

@@ -0,0 +1,6 @@
+//from sdl_stdinc.h
+
+{**
+ *  Free memory returned by functions like SDL_GetBasePath(), SDL_GetPrefPath(), etc.
+ *}
+Procedure SDL_free(mem: Pointer); cdecl; external SDL_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_SDL_free' {$ENDIF} {$ENDIF};