SDL constants are all uppercase.
authorSam Lantinga <slouken@libsdl.org>
Sat, 05 Aug 2006 17:09:42 +0000
changeset 1965a788656ca29a
parent 1964 071b6598d48f
child 1966 6472256c21eb
SDL constants are all uppercase.
include/SDL_pixels.h
include/SDL_video.h
src/SDL_compat.c
src/video/SDL_pixels.c
src/video/SDL_renderer_gl.c
src/video/SDL_renderer_sw.c
src/video/SDL_video.c
src/video/SDL_yuv_sw.c
src/video/dummy/SDL_nullrender.c
src/video/dummy/SDL_nullvideo.c
src/video/win32/SDL_d3drender.c
src/video/win32/SDL_gdirender.c
src/video/win32/SDL_win32modes.c
test/common.c
test/testgl2.c
test/testsprite2.c
     1.1 --- a/include/SDL_pixels.h	Thu Aug 03 19:34:05 2006 +0000
     1.2 +++ b/include/SDL_pixels.h	Sat Aug 05 17:09:42 2006 +0000
     1.3 @@ -39,60 +39,60 @@
     1.4  
     1.5  enum
     1.6  {                               /* Pixel type */
     1.7 -    SDL_PixelType_Unknown,
     1.8 -    SDL_PixelType_Index1,
     1.9 -    SDL_PixelType_Index4,
    1.10 -    SDL_PixelType_Index8,
    1.11 -    SDL_PixelType_Packed8,
    1.12 -    SDL_PixelType_Packed16,
    1.13 -    SDL_PixelType_Packed32,
    1.14 -    SDL_PixelType_ArrayU8,
    1.15 -    SDL_PixelType_ArrayU16,
    1.16 -    SDL_PixelType_ArrayU32,
    1.17 -    SDL_PixelType_ArrayF16,
    1.18 -    SDL_PixelType_ArrayF32,
    1.19 +    SDL_PIXELTYPE_UNKNOWN,
    1.20 +    SDL_PIXELTYPE_INDEX1,
    1.21 +    SDL_PIXELTYPE_INDEX4,
    1.22 +    SDL_PIXELTYPE_INDEX8,
    1.23 +    SDL_PIXELTYPE_PACKED8,
    1.24 +    SDL_PIXELTYPE_PACKED16,
    1.25 +    SDL_PIXELTYPE_PACKED32,
    1.26 +    SDL_PIXELTYPE_ARRAYU8,
    1.27 +    SDL_PIXELTYPE_ARRAYU16,
    1.28 +    SDL_PIXELTYPE_ARRAYU32,
    1.29 +    SDL_PIXELTYPE_ARRAYF16,
    1.30 +    SDL_PIXELTYPE_ARRAYF32,
    1.31  };
    1.32  
    1.33  enum
    1.34  {                               /* bitmap pixel order, high bit -> low bit */
    1.35 -    SDL_BitmapOrder_None,
    1.36 -    SDL_BitmapOrder_4321,
    1.37 -    SDL_BitmapOrder_1234,
    1.38 +    SDL_BITMAPORDER_NONE,
    1.39 +    SDL_BITMAPORDER_4321,
    1.40 +    SDL_BITMAPORDER_1234,
    1.41  };
    1.42  enum
    1.43  {                               /* packed component order, high bit -> low bit */
    1.44 -    SDL_PackedOrder_None,
    1.45 -    SDL_PackedOrder_XRGB,
    1.46 -    SDL_PackedOrder_RGBX,
    1.47 -    SDL_PackedOrder_ARGB,
    1.48 -    SDL_PackedOrder_RGBA,
    1.49 -    SDL_PackedOrder_XBGR,
    1.50 -    SDL_PackedOrder_BGRX,
    1.51 -    SDL_PackedOrder_ABGR,
    1.52 -    SDL_PackedOrder_BGRA,
    1.53 +    SDL_PACKEDORDER_NONE,
    1.54 +    SDL_PACKEDORDER_XRGB,
    1.55 +    SDL_PACKEDORDER_RGBX,
    1.56 +    SDL_PACKEDORDER_ARGB,
    1.57 +    SDL_PACKEDORDER_RGBA,
    1.58 +    SDL_PACKEDORDER_XBGR,
    1.59 +    SDL_PACKEDORDER_BGRX,
    1.60 +    SDL_PACKEDORDER_ABGR,
    1.61 +    SDL_PACKEDORDER_BGRA,
    1.62  };
    1.63  enum
    1.64  {                               /* array component order, low byte -> high byte */
    1.65 -    SDL_ArrayOrder_None,
    1.66 -    SDL_ArrayOrder_RGB,
    1.67 -    SDL_ArrayOrder_RGBA,
    1.68 -    SDL_ArrayOrder_ARGB,
    1.69 -    SDL_ArrayOrder_BGR,
    1.70 -    SDL_ArrayOrder_BGRA,
    1.71 -    SDL_ArrayOrder_ABGR,
    1.72 +    SDL_ARRAYORDER_NONE,
    1.73 +    SDL_ARRAYORDER_RGB,
    1.74 +    SDL_ARRAYORDER_RGBA,
    1.75 +    SDL_ARRAYORDER_ARGB,
    1.76 +    SDL_ARRAYORDER_BGR,
    1.77 +    SDL_ARRAYORDER_BGRA,
    1.78 +    SDL_ARRAYORDER_ABGR,
    1.79  };
    1.80  
    1.81  enum
    1.82  {                               /* Packed component layout */
    1.83 -    SDL_PackedLayout_None,
    1.84 -    SDL_PackedLayout_332,
    1.85 -    SDL_PackedLayout_4444,
    1.86 -    SDL_PackedLayout_1555,
    1.87 -    SDL_PackedLayout_5551,
    1.88 -    SDL_PackedLayout_565,
    1.89 -    SDL_PackedLayout_8888,
    1.90 -    SDL_PackedLayout_2101010,
    1.91 -    SDL_PackedLayout_1010102,
    1.92 +    SDL_PACKEDLAYOUT_NONE,
    1.93 +    SDL_PACKEDLAYOUT_332,
    1.94 +    SDL_PACKEDLAYOUT_4444,
    1.95 +    SDL_PACKEDLAYOUT_1555,
    1.96 +    SDL_PACKEDLAYOUT_5551,
    1.97 +    SDL_PACKEDLAYOUT_565,
    1.98 +    SDL_PACKEDLAYOUT_8888,
    1.99 +    SDL_PACKEDLAYOUT_2101010,
   1.100 +    SDL_PACKEDLAYOUT_1010102,
   1.101  };
   1.102  
   1.103  #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) \
   1.104 @@ -109,85 +109,85 @@
   1.105  #define SDL_BYTESPERPIXEL(X)	(((X) >> 0) & 0xFF)
   1.106  
   1.107  #define SDL_ISPIXELFORMAT_INDEXED(format)   \
   1.108 -    ((SDL_PIXELTYPE(format) == SDL_PixelType_Index1) || \
   1.109 -     (SDL_PIXELTYPE(format) == SDL_PixelType_Index4) || \
   1.110 -     (SDL_PIXELTYPE(format) == SDL_PixelType_Index8))
   1.111 +    ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \
   1.112 +     (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \
   1.113 +     (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8))
   1.114  
   1.115  #define SDL_ISPIXELFORMAT_FOURCC(format)    \
   1.116      ((format) && !((format) & 0x80000000))
   1.117  
   1.118  enum
   1.119  {
   1.120 -    SDL_PixelFormat_Unknown,
   1.121 -    SDL_PixelFormat_Index1LSB =
   1.122 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index1, SDL_BitmapOrder_1234, 0,
   1.123 +    SDL_PIXELFORMAT_UNKNOWN,
   1.124 +    SDL_PIXELFORMAT_INDEX1LSB =
   1.125 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0,
   1.126                                 1, 0),
   1.127 -    SDL_PixelFormat_Index1MSB =
   1.128 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index1, SDL_BitmapOrder_4321, 0,
   1.129 +    SDL_PIXELFORMAT_INDEX1MSB =
   1.130 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0,
   1.131                                 1, 0),
   1.132 -    SDL_PixelFormat_Index4LSB =
   1.133 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index4, SDL_BitmapOrder_1234, 0,
   1.134 +    SDL_PIXELFORMAT_INDEX4LSB =
   1.135 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0,
   1.136                                 2, 0),
   1.137 -    SDL_PixelFormat_Index4MSB =
   1.138 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index4, SDL_BitmapOrder_4321, 0,
   1.139 +    SDL_PIXELFORMAT_INDEX4MSB =
   1.140 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0,
   1.141                                 2, 0),
   1.142 -    SDL_PixelFormat_Index8 =
   1.143 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Index8, 0, 0, 8, 1),
   1.144 -    SDL_PixelFormat_RGB332 =
   1.145 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed8, SDL_PackedOrder_XRGB,
   1.146 -                               SDL_PackedLayout_332, 8, 1),
   1.147 -    SDL_PixelFormat_RGB444 =
   1.148 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
   1.149 -                               SDL_PackedLayout_4444, 12, 2),
   1.150 -    SDL_PixelFormat_RGB555 =
   1.151 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
   1.152 -                               SDL_PackedLayout_1555, 15, 2),
   1.153 -    SDL_PixelFormat_ARGB4444 =
   1.154 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_ARGB,
   1.155 -                               SDL_PackedLayout_4444, 16, 2),
   1.156 -    SDL_PixelFormat_ARGB1555 =
   1.157 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_ARGB,
   1.158 -                               SDL_PackedLayout_1555, 16, 2),
   1.159 -    SDL_PixelFormat_RGB565 =
   1.160 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed16, SDL_PackedOrder_XRGB,
   1.161 -                               SDL_PackedLayout_565, 16, 2),
   1.162 -    SDL_PixelFormat_RGB24 =
   1.163 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_ArrayU8, SDL_ArrayOrder_RGB, 0,
   1.164 +    SDL_PIXELFORMAT_INDEX8 =
   1.165 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1),
   1.166 +    SDL_PIXELFORMAT_RGB332 =
   1.167 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB,
   1.168 +                               SDL_PACKEDLAYOUT_332, 8, 1),
   1.169 +    SDL_PIXELFORMAT_RGB444 =
   1.170 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
   1.171 +                               SDL_PACKEDLAYOUT_4444, 12, 2),
   1.172 +    SDL_PIXELFORMAT_RGB555 =
   1.173 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
   1.174 +                               SDL_PACKEDLAYOUT_1555, 15, 2),
   1.175 +    SDL_PIXELFORMAT_ARGB4444 =
   1.176 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
   1.177 +                               SDL_PACKEDLAYOUT_4444, 16, 2),
   1.178 +    SDL_PIXELFORMAT_ARGB1555 =
   1.179 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
   1.180 +                               SDL_PACKEDLAYOUT_1555, 16, 2),
   1.181 +    SDL_PIXELFORMAT_RGB565 =
   1.182 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
   1.183 +                               SDL_PACKEDLAYOUT_565, 16, 2),
   1.184 +    SDL_PIXELFORMAT_RGB24 =
   1.185 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0,
   1.186                                 24, 3),
   1.187 -    SDL_PixelFormat_BGR24 =
   1.188 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_ArrayU8, SDL_ArrayOrder_BGR, 0,
   1.189 +    SDL_PIXELFORMAT_BGR24 =
   1.190 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0,
   1.191                                 24, 3),
   1.192 -    SDL_PixelFormat_RGB888 =
   1.193 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_XRGB,
   1.194 -                               SDL_PackedLayout_8888, 24, 4),
   1.195 -    SDL_PixelFormat_BGR888 =
   1.196 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_XBGR,
   1.197 -                               SDL_PackedLayout_8888, 24, 4),
   1.198 -    SDL_PixelFormat_ARGB8888 =
   1.199 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_ARGB,
   1.200 -                               SDL_PackedLayout_8888, 32, 4),
   1.201 -    SDL_PixelFormat_RGBA8888 =
   1.202 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_RGBA,
   1.203 -                               SDL_PackedLayout_8888, 32, 4),
   1.204 -    SDL_PixelFormat_ABGR8888 =
   1.205 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_ABGR,
   1.206 -                               SDL_PackedLayout_8888, 32, 4),
   1.207 -    SDL_PixelFormat_BGRA8888 =
   1.208 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_BGRA,
   1.209 -                               SDL_PackedLayout_8888, 32, 4),
   1.210 -    SDL_PixelFormat_ARGB2101010 =
   1.211 -        SDL_DEFINE_PIXELFORMAT(SDL_PixelType_Packed32, SDL_PackedOrder_ARGB,
   1.212 -                               SDL_PackedLayout_2101010, 32, 4),
   1.213 +    SDL_PIXELFORMAT_RGB888 =
   1.214 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB,
   1.215 +                               SDL_PACKEDLAYOUT_8888, 24, 4),
   1.216 +    SDL_PIXELFORMAT_BGR888 =
   1.217 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR,
   1.218 +                               SDL_PACKEDLAYOUT_8888, 24, 4),
   1.219 +    SDL_PIXELFORMAT_ARGB8888 =
   1.220 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
   1.221 +                               SDL_PACKEDLAYOUT_8888, 32, 4),
   1.222 +    SDL_PIXELFORMAT_RGBA8888 =
   1.223 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA,
   1.224 +                               SDL_PACKEDLAYOUT_8888, 32, 4),
   1.225 +    SDL_PIXELFORMAT_ABGR8888 =
   1.226 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR,
   1.227 +                               SDL_PACKEDLAYOUT_8888, 32, 4),
   1.228 +    SDL_PIXELFORMAT_BGRA8888 =
   1.229 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA,
   1.230 +                               SDL_PACKEDLAYOUT_8888, 32, 4),
   1.231 +    SDL_PIXELFORMAT_ARGB2101010 =
   1.232 +        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
   1.233 +                               SDL_PACKEDLAYOUT_2101010, 32, 4),
   1.234  
   1.235 -    SDL_PixelFormat_YV12 =      /* Planar mode: Y + V + U  (3 planes) */
   1.236 +    SDL_PIXELFORMAT_YV12 =      /* Planar mode: Y + V + U  (3 planes) */
   1.237          SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
   1.238 -    SDL_PixelFormat_IYUV =      /* Planar mode: Y + U + V  (3 planes) */
   1.239 +    SDL_PIXELFORMAT_IYUV =      /* Planar mode: Y + U + V  (3 planes) */
   1.240          SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'),
   1.241 -    SDL_PixelFormat_YUY2 =      /* Packed mode: Y0+U0+Y1+V0 (1 plane) */
   1.242 +    SDL_PIXELFORMAT_YUY2 =      /* Packed mode: Y0+U0+Y1+V0 (1 plane) */
   1.243          SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'),
   1.244 -    SDL_PixelFormat_UYVY =      /* Packed mode: U0+Y0+V0+Y1 (1 plane) */
   1.245 +    SDL_PIXELFORMAT_UYVY =      /* Packed mode: U0+Y0+V0+Y1 (1 plane) */
   1.246          SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
   1.247 -    SDL_PixelFormat_YVYU =      /* Packed mode: Y0+V0+Y1+U0 (1 plane) */
   1.248 +    SDL_PIXELFORMAT_YVYU =      /* Packed mode: Y0+V0+Y1+U0 (1 plane) */
   1.249          SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U'),
   1.250  };
   1.251  
     2.1 --- a/include/SDL_video.h	Thu Aug 03 19:34:05 2006 +0000
     2.2 +++ b/include/SDL_video.h	Sat Aug 05 17:09:42 2006 +0000
     2.3 @@ -170,13 +170,13 @@
     2.4   */
     2.5  typedef enum
     2.6  {
     2.7 -    SDL_Renderer_SingleBuffer = 0x00000001,     /**< Render directly to the window, if possible */
     2.8 -    SDL_Renderer_PresentCopy = 0x00000002,      /**< Present uses a copy from back buffer to the front buffer */
     2.9 -    SDL_Renderer_PresentFlip2 = 0x00000004,     /**< Present uses a flip, swapping back buffer and front buffer */
    2.10 -    SDL_Renderer_PresentFlip3 = 0x00000008,     /**< Present uses a flip, rotating between two back buffers and a front buffer */
    2.11 -    SDL_Renderer_PresentDiscard = 0x00000010,   /**< Present leaves the contents of the backbuffer undefined */
    2.12 -    SDL_Renderer_PresentVSync = 0x00000020,     /**< Present is synchronized with the refresh rate */
    2.13 -    SDL_Renderer_Accelerated = 0x00000040,      /**< The renderer uses hardware acceleration */
    2.14 +    SDL_RENDERER_SINGLEBUFFER = 0x00000001,     /**< Render directly to the window, if possible */
    2.15 +    SDL_RENDERER_PRESENTCOPY = 0x00000002,      /**< Present uses a copy from back buffer to the front buffer */
    2.16 +    SDL_RENDERER_PRESENTFLIP2 = 0x00000004,     /**< Present uses a flip, swapping back buffer and front buffer */
    2.17 +    SDL_RENDERER_PRESENTFLIP3 = 0x00000008,     /**< Present uses a flip, rotating between two back buffers and a front buffer */
    2.18 +    SDL_RENDERER_PRESENTDISCARD = 0x00000010,   /**< Present leaves the contents of the backbuffer undefined */
    2.19 +    SDL_RENDERER_PRESENTVSYNC = 0x00000020,     /**< Present is synchronized with the refresh rate */
    2.20 +    SDL_RENDERER_ACCELERATED = 0x00000040,      /**< The renderer uses hardware acceleration */
    2.21  } SDL_RendererFlags;
    2.22  
    2.23  /**
    2.24 @@ -203,8 +203,8 @@
    2.25   */
    2.26  typedef enum
    2.27  {
    2.28 -    SDL_TextureAccess_Local,    /**< Lockable system memory */
    2.29 -    SDL_TextureAccess_Remote,   /**< Unlockable video memory */
    2.30 +    SDL_TEXTUREACCESS_LOCAL,    /**< Lockable system memory */
    2.31 +    SDL_TEXTUREACCESS_REMOTE,   /**< Unlockable video memory */
    2.32  } SDL_TextureAccess;
    2.33  
    2.34  /**
    2.35 @@ -214,11 +214,11 @@
    2.36   */
    2.37  typedef enum
    2.38  {
    2.39 -    SDL_TextureBlendMode_None = 0x00000000,     /**< No blending */
    2.40 -    SDL_TextureBlendMode_Mask = 0x00000001,     /**< dst = A ? src : dst (alpha is mask) */
    2.41 -    SDL_TextureBlendMode_Blend = 0x00000002,    /**< dst = (src * A) + (dst * (1-A)) */
    2.42 -    SDL_TextureBlendMode_Add = 0x00000004,      /**< dst = (src * A) + dst */
    2.43 -    SDL_TextureBlendMode_Mod = 0x00000008,      /**< dst = src * dst */
    2.44 +    SDL_TEXTUREBLENDMODE_NONE = 0x00000000,     /**< No blending */
    2.45 +    SDL_TEXTUREBLENDMODE_MASK = 0x00000001,     /**< dst = A ? src : dst (alpha is mask) */
    2.46 +    SDL_TEXTUREBLENDMODE_BLEND = 0x00000002,    /**< dst = (src * A) + (dst * (1-A)) */
    2.47 +    SDL_TEXTUREBLENDMODE_ADD = 0x00000004,      /**< dst = (src * A) + dst */
    2.48 +    SDL_TEXTUREBLENDMODE_MOD = 0x00000008,      /**< dst = src * dst */
    2.49  } SDL_TextureBlendMode;
    2.50  
    2.51  /**
    2.52 @@ -228,10 +228,10 @@
    2.53   */
    2.54  typedef enum
    2.55  {
    2.56 -    SDL_TextureScaleMode_None = 0x00000000,     /**< No scaling, rectangles must match dimensions */
    2.57 -    SDL_TextureScaleMode_Fast = 0x00000001,     /**< Point sampling or equivalent algorithm */
    2.58 -    SDL_TextureScaleMode_Slow = 0x00000002,     /**< Linear filtering or equivalent algorithm */
    2.59 -    SDL_TextureScaleMode_Best = 0x00000004,     /**< Bicubic filtering or equivalent algorithm */
    2.60 +    SDL_TEXTURESCALEMODE_NONE = 0x00000000,     /**< No scaling, rectangles must match dimensions */
    2.61 +    SDL_TEXTURESCALEMODE_FAST = 0x00000001,     /**< Point sampling or equivalent algorithm */
    2.62 +    SDL_TEXTURESCALEMODE_SLOW = 0x00000002,     /**< Linear filtering or equivalent algorithm */
    2.63 +    SDL_TEXTURESCALEMODE_BEST = 0x00000004,     /**< Bicubic filtering or equivalent algorithm */
    2.64  } SDL_TextureScaleMode;
    2.65  
    2.66  /**
     3.1 --- a/src/SDL_compat.c	Thu Aug 03 19:34:05 2006 +0000
     3.2 +++ b/src/SDL_compat.c	Sat Aug 05 17:09:42 2006 +0000
     3.3 @@ -401,23 +401,23 @@
     3.4              if (desktop_format) {
     3.5                  desired_format = desktop_format;
     3.6              } else {
     3.7 -                desired_format = SDL_PixelFormat_RGB888;
     3.8 +                desired_format = SDL_PIXELFORMAT_RGB888;
     3.9              }
    3.10              break;
    3.11          case 8:
    3.12 -            desired_format = SDL_PixelFormat_Index8;
    3.13 +            desired_format = SDL_PIXELFORMAT_INDEX8;
    3.14              break;
    3.15          case 15:
    3.16 -            desired_format = SDL_PixelFormat_RGB555;
    3.17 +            desired_format = SDL_PIXELFORMAT_RGB555;
    3.18              break;
    3.19          case 16:
    3.20 -            desired_format = SDL_PixelFormat_RGB565;
    3.21 +            desired_format = SDL_PIXELFORMAT_RGB565;
    3.22              break;
    3.23          case 24:
    3.24 -            desired_format = SDL_PixelFormat_RGB24;
    3.25 +            desired_format = SDL_PIXELFORMAT_RGB24;
    3.26              break;
    3.27          case 32:
    3.28 -            desired_format = SDL_PixelFormat_RGB888;
    3.29 +            desired_format = SDL_PIXELFORMAT_RGB888;
    3.30              break;
    3.31          default:
    3.32              SDL_SetError("Unsupported bpp in SDL_SetVideoMode()");
    3.33 @@ -458,18 +458,18 @@
    3.34      /* Create a renderer for the window */
    3.35      if (SDL_CreateRenderer
    3.36          (SDL_VideoWindow, -1,
    3.37 -         SDL_Renderer_SingleBuffer | SDL_Renderer_PresentDiscard) < 0) {
    3.38 +         SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD) < 0) {
    3.39          return NULL;
    3.40      }
    3.41      SDL_GetRendererInfo(-1, &SDL_VideoRendererInfo);
    3.42  
    3.43      /* Create a texture for the screen surface */
    3.44      SDL_VideoTexture =
    3.45 -        SDL_CreateTexture(desired_format, SDL_TextureAccess_Local, width,
    3.46 +        SDL_CreateTexture(desired_format, SDL_TEXTUREACCESS_LOCAL, width,
    3.47                            height);
    3.48      if (!SDL_VideoTexture) {
    3.49          SDL_VideoTexture =
    3.50 -            SDL_CreateTexture(SDL_PixelFormat_RGB888, SDL_TextureAccess_Local,
    3.51 +            SDL_CreateTexture(SDL_PIXELFORMAT_RGB888, SDL_TEXTUREACCESS_LOCAL,
    3.52                                width, height);
    3.53      }
    3.54      if (!SDL_VideoTexture) {
    3.55 @@ -659,11 +659,11 @@
    3.56          screen = SDL_VideoSurface;
    3.57      }
    3.58      if (screen == SDL_VideoSurface) {
    3.59 -        if (SDL_VideoRendererInfo.flags & SDL_Renderer_PresentCopy) {
    3.60 +        if (SDL_VideoRendererInfo.flags & SDL_RENDERER_PRESENTCOPY) {
    3.61              for (i = 0; i < numrects; ++i) {
    3.62                  SDL_RenderCopy(SDL_VideoTexture, &rects[i], &rects[i],
    3.63 -                               SDL_TextureBlendMode_None,
    3.64 -                               SDL_TextureScaleMode_None);
    3.65 +                               SDL_TEXTUREBLENDMODE_NONE,
    3.66 +                               SDL_TEXTURESCALEMODE_NONE);
    3.67              }
    3.68          } else {
    3.69              SDL_Rect rect;
    3.70 @@ -672,8 +672,8 @@
    3.71              rect.w = screen->w;
    3.72              rect.h = screen->h;
    3.73              SDL_RenderCopy(SDL_VideoTexture, &rect, &rect,
    3.74 -                           SDL_TextureBlendMode_None,
    3.75 -                           SDL_TextureScaleMode_None);
    3.76 +                           SDL_TEXTUREBLENDMODE_NONE,
    3.77 +                           SDL_TEXTURESCALEMODE_NONE);
    3.78          }
    3.79          SDL_RenderPresent();
    3.80      }
    3.81 @@ -1304,19 +1304,19 @@
    3.82  
    3.83      switch (format) {
    3.84      case SDL_YV12_OVERLAY:
    3.85 -        texture_format = SDL_PixelFormat_YV12;
    3.86 +        texture_format = SDL_PIXELFORMAT_YV12;
    3.87          break;
    3.88      case SDL_IYUV_OVERLAY:
    3.89 -        texture_format = SDL_PixelFormat_IYUV;
    3.90 +        texture_format = SDL_PIXELFORMAT_IYUV;
    3.91          break;
    3.92      case SDL_YUY2_OVERLAY:
    3.93 -        texture_format = SDL_PixelFormat_YUY2;
    3.94 +        texture_format = SDL_PIXELFORMAT_YUY2;
    3.95          break;
    3.96      case SDL_UYVY_OVERLAY:
    3.97 -        texture_format = SDL_PixelFormat_UYVY;
    3.98 +        texture_format = SDL_PIXELFORMAT_UYVY;
    3.99          break;
   3.100      case SDL_YVYU_OVERLAY:
   3.101 -        texture_format = SDL_PixelFormat_YVYU;
   3.102 +        texture_format = SDL_PIXELFORMAT_YVYU;
   3.103          break;
   3.104      default:
   3.105          SDL_SetError("Unknown YUV format");
   3.106 @@ -1364,7 +1364,7 @@
   3.107      }
   3.108  
   3.109      overlay->hwdata->textureID =
   3.110 -        SDL_CreateTexture(texture_format, SDL_TextureAccess_Local, w, h);
   3.111 +        SDL_CreateTexture(texture_format, SDL_TEXTUREACCESS_LOCAL, w, h);
   3.112      if (!overlay->hwdata->textureID) {
   3.113          SDL_FreeYUVOverlay(overlay);
   3.114          return NULL;
   3.115 @@ -1410,8 +1410,8 @@
   3.116  SDL_DisplayYUVOverlay(SDL_Overlay * overlay, SDL_Rect * dstrect)
   3.117  {
   3.118      if (SDL_RenderCopy(overlay->hwdata->textureID, NULL, dstrect,
   3.119 -                       SDL_TextureBlendMode_None,
   3.120 -                       SDL_TextureScaleMode_Fast) < 0) {
   3.121 +                       SDL_TEXTUREBLENDMODE_NONE,
   3.122 +                       SDL_TEXTURESCALEMODE_FAST) < 0) {
   3.123          return -1;
   3.124      }
   3.125      SDL_RenderPresent();
     4.1 --- a/src/video/SDL_pixels.c	Thu Aug 03 19:34:05 2006 +0000
     4.2 +++ b/src/video/SDL_pixels.c	Sat Aug 05 17:09:42 2006 +0000
     4.3 @@ -46,45 +46,45 @@
     4.4      }
     4.5      *Rmask = *Gmask = *Bmask = *Amask = 0;
     4.6  
     4.7 -    if (SDL_PIXELTYPE(format) != SDL_PixelType_Packed8 &&
     4.8 -        SDL_PIXELTYPE(format) != SDL_PixelType_Packed16 &&
     4.9 -        SDL_PIXELTYPE(format) != SDL_PixelType_Packed32) {
    4.10 +    if (SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED8 &&
    4.11 +        SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED16 &&
    4.12 +        SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED32) {
    4.13          /* Not a format that uses masks */
    4.14          return SDL_TRUE;
    4.15      }
    4.16  
    4.17      switch (SDL_PIXELLAYOUT(format)) {
    4.18 -    case SDL_PackedLayout_332:
    4.19 +    case SDL_PACKEDLAYOUT_332:
    4.20          masks[0] = 0x00000000;
    4.21          masks[1] = 0x000000E0;
    4.22          masks[2] = 0x0000001C;
    4.23          masks[3] = 0x00000003;
    4.24          break;
    4.25 -    case SDL_PackedLayout_4444:
    4.26 +    case SDL_PACKEDLAYOUT_4444:
    4.27          masks[0] = 0x0000F000;
    4.28          masks[1] = 0x00000F00;
    4.29          masks[2] = 0x000000F0;
    4.30          masks[3] = 0x0000000F;
    4.31          break;
    4.32 -    case SDL_PackedLayout_1555:
    4.33 +    case SDL_PACKEDLAYOUT_1555:
    4.34          masks[0] = 0x00008000;
    4.35          masks[1] = 0x00007C00;
    4.36          masks[2] = 0x000003E0;
    4.37          masks[3] = 0x0000001F;
    4.38          break;
    4.39 -    case SDL_PackedLayout_565:
    4.40 +    case SDL_PACKEDLAYOUT_565:
    4.41          masks[0] = 0x00000000;
    4.42          masks[1] = 0x0000F800;
    4.43          masks[2] = 0x000007E0;
    4.44          masks[3] = 0x0000001F;
    4.45          break;
    4.46 -    case SDL_PackedLayout_8888:
    4.47 +    case SDL_PACKEDLAYOUT_8888:
    4.48          masks[0] = 0xFF000000;
    4.49          masks[1] = 0x00FF0000;
    4.50          masks[2] = 0x0000FF00;
    4.51          masks[3] = 0x000000FF;
    4.52          break;
    4.53 -    case SDL_PackedLayout_2101010:
    4.54 +    case SDL_PACKEDLAYOUT_2101010:
    4.55          masks[0] = 0xC0000000;
    4.56          masks[1] = 0x3FF00000;
    4.57          masks[2] = 0x000FFC00;
    4.58 @@ -96,45 +96,45 @@
    4.59      }
    4.60  
    4.61      switch (SDL_PIXELORDER(format)) {
    4.62 -    case SDL_PackedOrder_XRGB:
    4.63 +    case SDL_PACKEDORDER_XRGB:
    4.64          *Rmask = masks[1];
    4.65          *Gmask = masks[2];
    4.66          *Bmask = masks[3];
    4.67          break;
    4.68 -    case SDL_PackedOrder_RGBX:
    4.69 +    case SDL_PACKEDORDER_RGBX:
    4.70          *Rmask = masks[0];
    4.71          *Gmask = masks[1];
    4.72          *Bmask = masks[2];
    4.73          break;
    4.74 -    case SDL_PackedOrder_ARGB:
    4.75 +    case SDL_PACKEDORDER_ARGB:
    4.76          *Amask = masks[0];
    4.77          *Rmask = masks[1];
    4.78          *Gmask = masks[2];
    4.79          *Bmask = masks[3];
    4.80          break;
    4.81 -    case SDL_PackedOrder_RGBA:
    4.82 +    case SDL_PACKEDORDER_RGBA:
    4.83          *Rmask = masks[0];
    4.84          *Gmask = masks[1];
    4.85          *Bmask = masks[2];
    4.86          *Amask = masks[3];
    4.87          break;
    4.88 -    case SDL_PackedOrder_XBGR:
    4.89 +    case SDL_PACKEDORDER_XBGR:
    4.90          *Bmask = masks[1];
    4.91          *Gmask = masks[2];
    4.92          *Rmask = masks[3];
    4.93          break;
    4.94 -    case SDL_PackedOrder_BGRX:
    4.95 +    case SDL_PACKEDORDER_BGRX:
    4.96          *Bmask = masks[0];
    4.97          *Gmask = masks[1];
    4.98          *Rmask = masks[2];
    4.99          break;
   4.100 -    case SDL_PackedOrder_BGRA:
   4.101 +    case SDL_PACKEDORDER_BGRA:
   4.102          *Bmask = masks[0];
   4.103          *Gmask = masks[1];
   4.104          *Rmask = masks[2];
   4.105          *Amask = masks[3];
   4.106          break;
   4.107 -    case SDL_PackedOrder_ABGR:
   4.108 +    case SDL_PACKEDORDER_ABGR:
   4.109          *Amask = masks[0];
   4.110          *Bmask = masks[1];
   4.111          *Gmask = masks[2];
   4.112 @@ -155,64 +155,64 @@
   4.113      case 8:
   4.114          switch (Rmask) {
   4.115          case 0:
   4.116 -            return SDL_PixelFormat_Index8;
   4.117 +            return SDL_PIXELFORMAT_INDEX8;
   4.118          case 0xE0:
   4.119 -            return SDL_PixelFormat_RGB332;
   4.120 +            return SDL_PIXELFORMAT_RGB332;
   4.121          }
   4.122          break;
   4.123      case 12:
   4.124          switch (Rmask) {
   4.125          case 0x0F00:
   4.126 -            return SDL_PixelFormat_RGB444;
   4.127 +            return SDL_PIXELFORMAT_RGB444;
   4.128          }
   4.129          break;
   4.130      case 15:
   4.131          switch (Rmask) {
   4.132          case 0x7C00:
   4.133 -            return SDL_PixelFormat_RGB555;
   4.134 +            return SDL_PIXELFORMAT_RGB555;
   4.135          }
   4.136          break;
   4.137      case 16:
   4.138          switch (Rmask) {
   4.139          case 0x0F00:
   4.140 -            return SDL_PixelFormat_ARGB4444;
   4.141 +            return SDL_PIXELFORMAT_ARGB4444;
   4.142          case 0x7C00:
   4.143 -            return SDL_PixelFormat_ARGB1555;
   4.144 +            return SDL_PIXELFORMAT_ARGB1555;
   4.145          case 0xF800:
   4.146 -            return SDL_PixelFormat_RGB565;
   4.147 +            return SDL_PIXELFORMAT_RGB565;
   4.148          }
   4.149          break;
   4.150      case 32:
   4.151          switch (Rmask) {
   4.152          case 0xFF000000:
   4.153              if (Amask == 0x000000FF) {
   4.154 -                return SDL_PixelFormat_RGBA8888;
   4.155 +                return SDL_PIXELFORMAT_RGBA8888;
   4.156              }
   4.157              break;
   4.158          case 0x00FF0000:
   4.159              if (Amask == 0xFF000000) {
   4.160 -                return SDL_PixelFormat_ARGB8888;
   4.161 +                return SDL_PIXELFORMAT_ARGB8888;
   4.162              } else {
   4.163 -                return SDL_PixelFormat_RGB888;
   4.164 +                return SDL_PIXELFORMAT_RGB888;
   4.165              }
   4.166              break;
   4.167          case 0x0000FF00:
   4.168              if (Amask == 0x000000FF) {
   4.169 -                return SDL_PixelFormat_BGRA8888;
   4.170 +                return SDL_PIXELFORMAT_BGRA8888;
   4.171              }
   4.172              break;
   4.173          case 0x000000FF:
   4.174              if (Amask == 0xFF000000) {
   4.175 -                return SDL_PixelFormat_ABGR8888;
   4.176 +                return SDL_PIXELFORMAT_ABGR8888;
   4.177              } else {
   4.178 -                return SDL_PixelFormat_BGR888;
   4.179 +                return SDL_PIXELFORMAT_BGR888;
   4.180              }
   4.181              break;
   4.182          case 0x3FF00000:
   4.183 -            return SDL_PixelFormat_ARGB2101010;
   4.184 +            return SDL_PIXELFORMAT_ARGB2101010;
   4.185          }
   4.186      }
   4.187 -    return SDL_PixelFormat_Unknown;
   4.188 +    return SDL_PIXELFORMAT_UNKNOWN;
   4.189  }
   4.190  
   4.191  
     5.1 --- a/src/video/SDL_renderer_gl.c	Thu Aug 03 19:34:05 2006 +0000
     5.2 +++ b/src/video/SDL_renderer_gl.c	Sat Aug 05 17:09:42 2006 +0000
     5.3 @@ -65,31 +65,31 @@
     5.4      GL_CreateRenderer,
     5.5      {
     5.6       "opengl",
     5.7 -     (SDL_Renderer_PresentDiscard | SDL_Renderer_PresentVSync |
     5.8 -      SDL_Renderer_Accelerated),
     5.9 -     (SDL_TextureBlendMode_None | SDL_TextureBlendMode_Mask |
    5.10 -      SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add |
    5.11 -      SDL_TextureBlendMode_Mod),
    5.12 -     (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast |
    5.13 -      SDL_TextureScaleMode_Slow),
    5.14 +     (SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC |
    5.15 +      SDL_RENDERER_ACCELERATED),
    5.16 +     (SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK |
    5.17 +      SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD |
    5.18 +      SDL_TEXTUREBLENDMODE_MOD),
    5.19 +     (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_FAST |
    5.20 +      SDL_TEXTURESCALEMODE_SLOW),
    5.21       16,
    5.22       {
    5.23 -      SDL_PixelFormat_Index1LSB,
    5.24 -      SDL_PixelFormat_Index1MSB,
    5.25 -      SDL_PixelFormat_Index8,
    5.26 -      SDL_PixelFormat_RGB332,
    5.27 -      SDL_PixelFormat_RGB444,
    5.28 -      SDL_PixelFormat_RGB555,
    5.29 -      SDL_PixelFormat_ARGB4444,
    5.30 -      SDL_PixelFormat_ARGB1555,
    5.31 -      SDL_PixelFormat_RGB565,
    5.32 -      SDL_PixelFormat_RGB24,
    5.33 -      SDL_PixelFormat_BGR24,
    5.34 -      SDL_PixelFormat_RGB888,
    5.35 -      SDL_PixelFormat_BGR888,
    5.36 -      SDL_PixelFormat_ARGB8888,
    5.37 -      SDL_PixelFormat_ABGR8888,
    5.38 -      SDL_PixelFormat_ARGB2101010},
    5.39 +      SDL_PIXELFORMAT_INDEX1LSB,
    5.40 +      SDL_PIXELFORMAT_INDEX1MSB,
    5.41 +      SDL_PIXELFORMAT_INDEX8,
    5.42 +      SDL_PIXELFORMAT_RGB332,
    5.43 +      SDL_PIXELFORMAT_RGB444,
    5.44 +      SDL_PIXELFORMAT_RGB555,
    5.45 +      SDL_PIXELFORMAT_ARGB4444,
    5.46 +      SDL_PIXELFORMAT_ARGB1555,
    5.47 +      SDL_PIXELFORMAT_RGB565,
    5.48 +      SDL_PIXELFORMAT_RGB24,
    5.49 +      SDL_PIXELFORMAT_BGR24,
    5.50 +      SDL_PIXELFORMAT_RGB888,
    5.51 +      SDL_PIXELFORMAT_BGR888,
    5.52 +      SDL_PIXELFORMAT_ARGB8888,
    5.53 +      SDL_PIXELFORMAT_ABGR8888,
    5.54 +      SDL_PIXELFORMAT_ARGB2101010},
    5.55       0,
    5.56       0}
    5.57  };
    5.58 @@ -236,7 +236,7 @@
    5.59      renderer->driverdata = data;
    5.60  
    5.61      renderer->info.flags =
    5.62 -        (SDL_Renderer_PresentDiscard | SDL_Renderer_Accelerated);
    5.63 +        (SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED);
    5.64  
    5.65      if (GL_LoadFunctions(data) < 0) {
    5.66          GL_DestroyRenderer(renderer);
    5.67 @@ -253,13 +253,13 @@
    5.68          return NULL;
    5.69      }
    5.70  
    5.71 -    if (flags & SDL_Renderer_PresentVSync) {
    5.72 +    if (flags & SDL_RENDERER_PRESENTVSYNC) {
    5.73          SDL_GL_SetSwapInterval(1);
    5.74      } else {
    5.75          SDL_GL_SetSwapInterval(0);
    5.76      }
    5.77      if (SDL_GL_GetSwapInterval() > 0) {
    5.78 -        renderer->info.flags |= SDL_Renderer_PresentVSync;
    5.79 +        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
    5.80      }
    5.81  
    5.82      data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
    5.83 @@ -325,78 +325,78 @@
    5.84      GLenum result;
    5.85  
    5.86      switch (texture->format) {
    5.87 -    case SDL_PixelFormat_Index1LSB:
    5.88 -    case SDL_PixelFormat_Index1MSB:
    5.89 +    case SDL_PIXELFORMAT_INDEX1LSB:
    5.90 +    case SDL_PIXELFORMAT_INDEX1MSB:
    5.91          internalFormat = GL_RGB;
    5.92          format = GL_COLOR_INDEX;
    5.93          type = GL_BITMAP;
    5.94          break;
    5.95 -    case SDL_PixelFormat_Index8:
    5.96 +    case SDL_PIXELFORMAT_INDEX8:
    5.97          internalFormat = GL_RGB;
    5.98          format = GL_COLOR_INDEX;
    5.99          type = GL_UNSIGNED_BYTE;
   5.100          break;
   5.101 -    case SDL_PixelFormat_RGB332:
   5.102 +    case SDL_PIXELFORMAT_RGB332:
   5.103          internalFormat = GL_R3_G3_B2;
   5.104          format = GL_RGB;
   5.105          type = GL_UNSIGNED_BYTE_3_3_2;
   5.106          break;
   5.107 -    case SDL_PixelFormat_RGB444:
   5.108 +    case SDL_PIXELFORMAT_RGB444:
   5.109          internalFormat = GL_RGB4;
   5.110          format = GL_RGB;
   5.111          type = GL_UNSIGNED_SHORT_4_4_4_4;
   5.112          break;
   5.113 -    case SDL_PixelFormat_RGB555:
   5.114 +    case SDL_PIXELFORMAT_RGB555:
   5.115          internalFormat = GL_RGB5;
   5.116          format = GL_RGB;
   5.117          type = GL_UNSIGNED_SHORT_5_5_5_1;
   5.118          break;
   5.119 -    case SDL_PixelFormat_ARGB4444:
   5.120 +    case SDL_PIXELFORMAT_ARGB4444:
   5.121          internalFormat = GL_RGBA4;
   5.122          format = GL_BGRA;
   5.123          type = GL_UNSIGNED_SHORT_4_4_4_4_REV;
   5.124          break;
   5.125 -    case SDL_PixelFormat_ARGB1555:
   5.126 +    case SDL_PIXELFORMAT_ARGB1555:
   5.127          internalFormat = GL_RGB5_A1;
   5.128          format = GL_BGRA;
   5.129          type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
   5.130          break;
   5.131 -    case SDL_PixelFormat_RGB565:
   5.132 +    case SDL_PIXELFORMAT_RGB565:
   5.133          internalFormat = GL_RGB8;
   5.134          format = GL_RGB;
   5.135          type = GL_UNSIGNED_SHORT_5_6_5;
   5.136          break;
   5.137 -    case SDL_PixelFormat_RGB24:
   5.138 +    case SDL_PIXELFORMAT_RGB24:
   5.139          internalFormat = GL_RGB8;
   5.140          format = GL_RGB;
   5.141          type = GL_UNSIGNED_BYTE;
   5.142          break;
   5.143 -    case SDL_PixelFormat_RGB888:
   5.144 +    case SDL_PIXELFORMAT_RGB888:
   5.145          internalFormat = GL_RGB8;
   5.146          format = GL_BGRA;
   5.147          type = GL_UNSIGNED_BYTE;
   5.148          break;
   5.149 -    case SDL_PixelFormat_BGR24:
   5.150 +    case SDL_PIXELFORMAT_BGR24:
   5.151          internalFormat = GL_RGB8;
   5.152          format = GL_BGR;
   5.153          type = GL_UNSIGNED_BYTE;
   5.154          break;
   5.155 -    case SDL_PixelFormat_BGR888:
   5.156 +    case SDL_PIXELFORMAT_BGR888:
   5.157          internalFormat = GL_RGB8;
   5.158          format = GL_RGBA;
   5.159          type = GL_UNSIGNED_BYTE;
   5.160          break;
   5.161 -    case SDL_PixelFormat_ARGB8888:
   5.162 +    case SDL_PIXELFORMAT_ARGB8888:
   5.163          internalFormat = GL_RGBA8;
   5.164          format = GL_BGRA;
   5.165          type = GL_UNSIGNED_BYTE;
   5.166          break;
   5.167 -    case SDL_PixelFormat_ABGR8888:
   5.168 +    case SDL_PIXELFORMAT_ABGR8888:
   5.169          internalFormat = GL_RGBA8;
   5.170          format = GL_RGBA;
   5.171          type = GL_UNSIGNED_BYTE;
   5.172          break;
   5.173 -    case SDL_PixelFormat_ARGB2101010:
   5.174 +    case SDL_PIXELFORMAT_ARGB2101010:
   5.175          internalFormat = GL_RGB10_A2;
   5.176          format = GL_BGRA;
   5.177          type = GL_UNSIGNED_INT_2_10_10_10_REV;
   5.178 @@ -465,9 +465,9 @@
   5.179  SetupTextureUpdate(GL_RenderData * renderdata, SDL_Texture * texture,
   5.180                     int pitch)
   5.181  {
   5.182 -    if (texture->format == SDL_PixelFormat_Index1LSB) {
   5.183 +    if (texture->format == SDL_PIXELFORMAT_INDEX1LSB) {
   5.184          renderdata->glPixelStorei(GL_UNPACK_LSB_FIRST, 1);
   5.185 -    } else if (texture->format == SDL_PixelFormat_Index1MSB) {
   5.186 +    } else if (texture->format == SDL_PIXELFORMAT_INDEX1MSB) {
   5.187          renderdata->glPixelStorei(GL_UNPACK_LSB_FIRST, 0);
   5.188      }
   5.189      renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
   5.190 @@ -608,22 +608,22 @@
   5.191  
   5.192      if (blendMode != data->blendMode) {
   5.193          switch (blendMode) {
   5.194 -        case SDL_TextureBlendMode_None:
   5.195 +        case SDL_TEXTUREBLENDMODE_NONE:
   5.196              data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
   5.197              data->glDisable(GL_BLEND);
   5.198              break;
   5.199 -        case SDL_TextureBlendMode_Mask:
   5.200 -        case SDL_TextureBlendMode_Blend:
   5.201 +        case SDL_TEXTUREBLENDMODE_MASK:
   5.202 +        case SDL_TEXTUREBLENDMODE_BLEND:
   5.203              data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   5.204              data->glEnable(GL_BLEND);
   5.205              data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   5.206              break;
   5.207 -        case SDL_TextureBlendMode_Add:
   5.208 +        case SDL_TEXTUREBLENDMODE_ADD:
   5.209              data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   5.210              data->glEnable(GL_BLEND);
   5.211              data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
   5.212              break;
   5.213 -        case SDL_TextureBlendMode_Mod:
   5.214 +        case SDL_TEXTUREBLENDMODE_MOD:
   5.215              data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   5.216              data->glEnable(GL_BLEND);
   5.217              data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
   5.218 @@ -634,15 +634,15 @@
   5.219  
   5.220      if (scaleMode != data->scaleMode) {
   5.221          switch (scaleMode) {
   5.222 -        case SDL_TextureScaleMode_None:
   5.223 -        case SDL_TextureScaleMode_Fast:
   5.224 +        case SDL_TEXTURESCALEMODE_NONE:
   5.225 +        case SDL_TEXTURESCALEMODE_FAST:
   5.226              data->glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER,
   5.227                                    GL_NEAREST);
   5.228              data->glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER,
   5.229                                    GL_NEAREST);
   5.230              break;
   5.231 -        case SDL_TextureScaleMode_Slow:
   5.232 -        case SDL_TextureScaleMode_Best:
   5.233 +        case SDL_TEXTURESCALEMODE_SLOW:
   5.234 +        case SDL_TEXTURESCALEMODE_BEST:
   5.235              data->glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER,
   5.236                                    GL_LINEAR);
   5.237              data->glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER,
     6.1 --- a/src/video/SDL_renderer_sw.c	Thu Aug 03 19:34:05 2006 +0000
     6.2 +++ b/src/video/SDL_renderer_sw.c	Sat Aug 05 17:09:42 2006 +0000
     6.3 @@ -67,25 +67,25 @@
     6.4      SW_CreateRenderer,
     6.5      {
     6.6       "software",
     6.7 -     (SDL_Renderer_SingleBuffer | SDL_Renderer_PresentCopy |
     6.8 -      SDL_Renderer_PresentFlip2 | SDL_Renderer_PresentFlip3 |
     6.9 -      SDL_Renderer_PresentDiscard | SDL_Renderer_PresentVSync),
    6.10 -     (SDL_TextureBlendMode_None | SDL_TextureBlendMode_Mask |
    6.11 -      SDL_TextureBlendMode_Blend),
    6.12 -     (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast),
    6.13 +     (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
    6.14 +      SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 |
    6.15 +      SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC),
    6.16 +     (SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK |
    6.17 +      SDL_TEXTUREBLENDMODE_BLEND),
    6.18 +     (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_FAST),
    6.19       11,
    6.20       {
    6.21 -      SDL_PixelFormat_Index8,
    6.22 -      SDL_PixelFormat_RGB555,
    6.23 -      SDL_PixelFormat_RGB565,
    6.24 -      SDL_PixelFormat_RGB888,
    6.25 -      SDL_PixelFormat_BGR888,
    6.26 -      SDL_PixelFormat_ARGB8888,
    6.27 -      SDL_PixelFormat_RGBA8888,
    6.28 -      SDL_PixelFormat_ABGR8888,
    6.29 -      SDL_PixelFormat_BGRA8888,
    6.30 -      SDL_PixelFormat_YUY2,
    6.31 -      SDL_PixelFormat_UYVY},
    6.32 +      SDL_PIXELFORMAT_INDEX8,
    6.33 +      SDL_PIXELFORMAT_RGB555,
    6.34 +      SDL_PIXELFORMAT_RGB565,
    6.35 +      SDL_PIXELFORMAT_RGB888,
    6.36 +      SDL_PIXELFORMAT_BGR888,
    6.37 +      SDL_PIXELFORMAT_ARGB8888,
    6.38 +      SDL_PIXELFORMAT_RGBA8888,
    6.39 +      SDL_PIXELFORMAT_ABGR8888,
    6.40 +      SDL_PIXELFORMAT_BGRA8888,
    6.41 +      SDL_PIXELFORMAT_YUY2,
    6.42 +      SDL_PIXELFORMAT_UYVY},
    6.43       0,
    6.44       0}
    6.45  };
    6.46 @@ -112,7 +112,7 @@
    6.47      }
    6.48  
    6.49      texture->format = format;
    6.50 -    texture->access = SDL_TextureAccess_Local;
    6.51 +    texture->access = SDL_TEXTUREACCESS_LOCAL;
    6.52      texture->w = w;
    6.53      texture->h = h;
    6.54      texture->renderer = renderer;
    6.55 @@ -199,23 +199,23 @@
    6.56  
    6.57      renderer->info.flags = 0;
    6.58  
    6.59 -    if (flags & SDL_Renderer_PresentFlip2) {
    6.60 -        renderer->info.flags |= SDL_Renderer_PresentFlip2;
    6.61 +    if (flags & SDL_RENDERER_PRESENTFLIP2) {
    6.62 +        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
    6.63          n = 2;
    6.64 -    } else if (flags & SDL_Renderer_PresentFlip3) {
    6.65 -        renderer->info.flags |= SDL_Renderer_PresentFlip3;
    6.66 +    } else if (flags & SDL_RENDERER_PRESENTFLIP3) {
    6.67 +        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
    6.68          n = 3;
    6.69      } else {
    6.70 -        renderer->info.flags |= SDL_Renderer_PresentCopy;
    6.71 +        renderer->info.flags |= SDL_RENDERER_PRESENTCOPY;
    6.72          n = 1;
    6.73      }
    6.74      data->format = displayMode->format;
    6.75  
    6.76      /* Find a render driver that we can use to display data */
    6.77 -    renderer_flags = (SDL_Renderer_SingleBuffer |
    6.78 -                      SDL_Renderer_PresentDiscard);
    6.79 -    if (flags & SDL_Renderer_PresentVSync) {
    6.80 -        renderer_flags |= SDL_Renderer_PresentVSync;
    6.81 +    renderer_flags = (SDL_RENDERER_SINGLEBUFFER |
    6.82 +                      SDL_RENDERER_PRESENTDISCARD);
    6.83 +    if (flags & SDL_RENDERER_PRESENTVSYNC) {
    6.84 +        renderer_flags |= SDL_RENDERER_PRESENTVSYNC;
    6.85      }
    6.86      desired_driver = SDL_getenv("SDL_VIDEO_RENDERER_SWDRIVER");
    6.87      for (i = 0; i < display->num_render_drivers; ++i) {
    6.88 @@ -237,8 +237,8 @@
    6.89          SDL_SetError("Couldn't find display render driver");
    6.90          return NULL;
    6.91      }
    6.92 -    if (data->renderer->info.flags & SDL_Renderer_PresentVSync) {
    6.93 -        renderer->info.flags |= SDL_Renderer_PresentVSync;
    6.94 +    if (data->renderer->info.flags & SDL_RENDERER_PRESENTVSYNC) {
    6.95 +        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
    6.96      }
    6.97  
    6.98      /* Create the textures we'll use for display */
    6.99 @@ -411,7 +411,7 @@
   6.100      SDL_Rect real_rect;
   6.101      int status;
   6.102  
   6.103 -    if (data->renderer->info.flags & SDL_Renderer_PresentCopy) {
   6.104 +    if (data->renderer->info.flags & SDL_RENDERER_PRESENTCOPY) {
   6.105          SDL_AddDirtyRect(&data->dirty, rect);
   6.106      }
   6.107  
   6.108 @@ -449,7 +449,7 @@
   6.109      SDL_Window *window = SDL_GetWindowFromID(renderer->window);
   6.110      int status;
   6.111  
   6.112 -    if (data->renderer->info.flags & SDL_Renderer_PresentCopy) {
   6.113 +    if (data->renderer->info.flags & SDL_RENDERER_PRESENTCOPY) {
   6.114          SDL_AddDirtyRect(&data->dirty, dstrect);
   6.115      }
   6.116  
   6.117 @@ -477,12 +477,12 @@
   6.118          real_dstrect = data->surface.clip_rect;
   6.119  
   6.120          if (blendMode &
   6.121 -            (SDL_TextureBlendMode_Mask | SDL_TextureBlendMode_Blend)) {
   6.122 +            (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND)) {
   6.123              SDL_SetAlpha(surface, SDL_SRCALPHA, 0);
   6.124          } else {
   6.125              SDL_SetAlpha(surface, 0, 0);
   6.126          }
   6.127 -        if (scaleMode != SDL_TextureScaleMode_None &&
   6.128 +        if (scaleMode != SDL_TEXTURESCALEMODE_NONE &&
   6.129              (srcrect->w != dstrect->w || srcrect->h != dstrect->h)) {
   6.130              status =
   6.131                  SDL_SoftStretch(surface, &real_srcrect, &data->surface,
   6.132 @@ -505,13 +505,13 @@
   6.133      SDL_Texture *texture = data->texture[data->current_texture];
   6.134  
   6.135      /* Send the data to the display */
   6.136 -    if (data->renderer->info.flags & SDL_Renderer_PresentCopy) {
   6.137 +    if (data->renderer->info.flags & SDL_RENDERER_PRESENTCOPY) {
   6.138          SDL_DirtyRect *dirty;
   6.139          for (dirty = data->dirty.list; dirty; dirty = dirty->next) {
   6.140              data->renderer->RenderCopy(data->renderer, texture, &dirty->rect,
   6.141                                         &dirty->rect,
   6.142 -                                       SDL_TextureBlendMode_None,
   6.143 -                                       SDL_TextureScaleMode_None);
   6.144 +                                       SDL_TEXTUREBLENDMODE_NONE,
   6.145 +                                       SDL_TEXTURESCALEMODE_NONE);
   6.146          }
   6.147          SDL_ClearDirtyRects(&data->dirty);
   6.148      } else {
   6.149 @@ -521,15 +521,15 @@
   6.150          rect.w = texture->w;
   6.151          rect.h = texture->h;
   6.152          data->renderer->RenderCopy(data->renderer, texture, &rect, &rect,
   6.153 -                                   SDL_TextureBlendMode_None,
   6.154 -                                   SDL_TextureScaleMode_None);
   6.155 +                                   SDL_TEXTUREBLENDMODE_NONE,
   6.156 +                                   SDL_TEXTURESCALEMODE_NONE);
   6.157      }
   6.158      data->renderer->RenderPresent(data->renderer);
   6.159  
   6.160      /* Update the flipping chain, if any */
   6.161 -    if (renderer->info.flags & SDL_Renderer_PresentFlip2) {
   6.162 +    if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
   6.163          data->current_texture = (data->current_texture + 1) % 2;
   6.164 -    } else if (renderer->info.flags & SDL_Renderer_PresentFlip3) {
   6.165 +    } else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
   6.166          data->current_texture = (data->current_texture + 1) % 3;
   6.167      }
   6.168  }
     7.1 --- a/src/video/SDL_video.c	Thu Aug 03 19:34:05 2006 +0000
     7.2 +++ b/src/video/SDL_video.c	Sat Aug 05 17:09:42 2006 +0000
     7.3 @@ -531,7 +531,7 @@
     7.4  
     7.5          /* Pick some reasonable defaults if the app and driver don't care */
     7.6          if (!closest->format) {
     7.7 -            closest->format = SDL_PixelFormat_RGB888;
     7.8 +            closest->format = SDL_PIXELFORMAT_RGB888;
     7.9          }
    7.10          if (!closest->w) {
    7.11              closest->w = 640;
     8.1 --- a/src/video/SDL_yuv_sw.c	Thu Aug 03 19:34:05 2006 +0000
     8.2 +++ b/src/video/SDL_yuv_sw.c	Sat Aug 05 17:09:42 2006 +0000
     8.3 @@ -975,8 +975,8 @@
     8.4  
     8.5      /* You have chosen wisely... */
     8.6      switch (swdata->texture->format) {
     8.7 -    case SDL_PixelFormat_YV12:
     8.8 -    case SDL_PixelFormat_IYUV:
     8.9 +    case SDL_PIXELFORMAT_YV12:
    8.10 +    case SDL_PIXELFORMAT_IYUV:
    8.11          if (SDL_BYTESPERPIXEL(target_format) == 2) {
    8.12  #if 0                           /*defined(__GNUC__) && defined(__i386__) && SDL_ASSEMBLY_ROUTINES */
    8.13              /* inline assembly functions */
    8.14 @@ -1015,9 +1015,9 @@
    8.15              swdata->Display2X = Color32DitherYV12Mod2X;
    8.16          }
    8.17          break;
    8.18 -    case SDL_PixelFormat_YUY2:
    8.19 -    case SDL_PixelFormat_UYVY:
    8.20 -    case SDL_PixelFormat_YVYU:
    8.21 +    case SDL_PIXELFORMAT_YUY2:
    8.22 +    case SDL_PIXELFORMAT_UYVY:
    8.23 +    case SDL_PIXELFORMAT_YVYU:
    8.24          if (SDL_BYTESPERPIXEL(target_format) == 2) {
    8.25              swdata->Display1X = Color16DitherYUY2Mod1X;
    8.26              swdata->Display2X = Color16DitherYUY2Mod2X;
    8.27 @@ -1061,11 +1061,11 @@
    8.28      }
    8.29  
    8.30      switch (texture->format) {
    8.31 -    case SDL_PixelFormat_YV12:
    8.32 -    case SDL_PixelFormat_IYUV:
    8.33 -    case SDL_PixelFormat_YUY2:
    8.34 -    case SDL_PixelFormat_UYVY:
    8.35 -    case SDL_PixelFormat_YVYU:
    8.36 +    case SDL_PIXELFORMAT_YV12:
    8.37 +    case SDL_PIXELFORMAT_IYUV:
    8.38 +    case SDL_PIXELFORMAT_YUY2:
    8.39 +    case SDL_PIXELFORMAT_UYVY:
    8.40 +    case SDL_PIXELFORMAT_YVYU:
    8.41          break;
    8.42      default:
    8.43          SDL_SetError("Unsupported YUV format");
    8.44 @@ -1073,7 +1073,7 @@
    8.45      }
    8.46  
    8.47      swdata->texture = texture;
    8.48 -    swdata->target_format = SDL_PixelFormat_Unknown;
    8.49 +    swdata->target_format = SDL_PIXELFORMAT_UNKNOWN;
    8.50      swdata->pixels = (Uint8 *) SDL_malloc(texture->w * texture->h * 2);
    8.51      swdata->colortab = (int *) SDL_malloc(4 * 256 * sizeof(int));
    8.52      swdata->rgb_2_pix = (Uint32 *) SDL_malloc(3 * 768 * sizeof(Uint32));
    8.53 @@ -1101,8 +1101,8 @@
    8.54  
    8.55      /* Find the pitch and offset values for the overlay */
    8.56      switch (texture->format) {
    8.57 -    case SDL_PixelFormat_YV12:
    8.58 -    case SDL_PixelFormat_IYUV:
    8.59 +    case SDL_PIXELFORMAT_YV12:
    8.60 +    case SDL_PIXELFORMAT_IYUV:
    8.61          swdata->pitches[0] = texture->w;
    8.62          swdata->pitches[1] = swdata->pitches[0] / 2;
    8.63          swdata->pitches[2] = swdata->pitches[0] / 2;
    8.64 @@ -1112,9 +1112,9 @@
    8.65          swdata->planes[2] =
    8.66              swdata->planes[1] + swdata->pitches[1] * texture->h / 2;
    8.67          break;
    8.68 -    case SDL_PixelFormat_YUY2:
    8.69 -    case SDL_PixelFormat_UYVY:
    8.70 -    case SDL_PixelFormat_YVYU:
    8.71 +    case SDL_PIXELFORMAT_YUY2:
    8.72 +    case SDL_PIXELFORMAT_UYVY:
    8.73 +    case SDL_PIXELFORMAT_YVYU:
    8.74          swdata->pitches[0] = texture->w * 2;
    8.75          swdata->planes[0] = swdata->pixels;
    8.76          break;
    8.77 @@ -1143,8 +1143,8 @@
    8.78      SDL_Texture *texture = swdata->texture;
    8.79  
    8.80      switch (texture->format) {
    8.81 -    case SDL_PixelFormat_YV12:
    8.82 -    case SDL_PixelFormat_IYUV:
    8.83 +    case SDL_PIXELFORMAT_YV12:
    8.84 +    case SDL_PIXELFORMAT_IYUV:
    8.85          if (rect
    8.86              && (rect->x != 0 || rect->y != 0 || rect->w != texture->w
    8.87                  || rect->h != texture->h)) {
    8.88 @@ -1154,9 +1154,9 @@
    8.89          }
    8.90          SDL_memcpy(swdata->pixels, pixels, texture->h * texture->w * 2);
    8.91          break;
    8.92 -    case SDL_PixelFormat_YUY2:
    8.93 -    case SDL_PixelFormat_UYVY:
    8.94 -    case SDL_PixelFormat_YVYU:
    8.95 +    case SDL_PIXELFORMAT_YUY2:
    8.96 +    case SDL_PIXELFORMAT_UYVY:
    8.97 +    case SDL_PIXELFORMAT_YVYU:
    8.98          {
    8.99              Uint8 *src, *dst;
   8.100              int row;
   8.101 @@ -1185,8 +1185,8 @@
   8.102      SDL_Texture *texture = swdata->texture;
   8.103  
   8.104      switch (texture->format) {
   8.105 -    case SDL_PixelFormat_YV12:
   8.106 -    case SDL_PixelFormat_IYUV:
   8.107 +    case SDL_PIXELFORMAT_YV12:
   8.108 +    case SDL_PIXELFORMAT_IYUV:
   8.109          if (rect
   8.110              && (rect->x != 0 || rect->y != 0 || rect->w != texture->w
   8.111                  || rect->h != texture->h)) {
   8.112 @@ -1277,27 +1277,27 @@
   8.113          pitch = swdata->stretch->pitch;
   8.114      }
   8.115      switch (texture->format) {
   8.116 -    case SDL_PixelFormat_YV12:
   8.117 +    case SDL_PIXELFORMAT_YV12:
   8.118          lum = swdata->planes[0];
   8.119          Cr = swdata->planes[1];
   8.120          Cb = swdata->planes[2];
   8.121          break;
   8.122 -    case SDL_PixelFormat_IYUV:
   8.123 +    case SDL_PIXELFORMAT_IYUV:
   8.124          lum = swdata->planes[0];
   8.125          Cr = swdata->planes[2];
   8.126          Cb = swdata->planes[1];
   8.127          break;
   8.128 -    case SDL_PixelFormat_YUY2:
   8.129 +    case SDL_PIXELFORMAT_YUY2:
   8.130          lum = swdata->planes[0];
   8.131          Cr = lum + 3;
   8.132          Cb = lum + 1;
   8.133          break;
   8.134 -    case SDL_PixelFormat_UYVY:
   8.135 +    case SDL_PIXELFORMAT_UYVY:
   8.136          lum = swdata->planes[0] + 1;
   8.137          Cr = lum + 1;
   8.138          Cb = lum - 1;
   8.139          break;
   8.140 -    case SDL_PixelFormat_YVYU:
   8.141 +    case SDL_PIXELFORMAT_YVYU:
   8.142          lum = swdata->planes[0];
   8.143          Cr = lum + 1;
   8.144          Cb = lum + 3;
     9.1 --- a/src/video/dummy/SDL_nullrender.c	Thu Aug 03 19:34:05 2006 +0000
     9.2 +++ b/src/video/dummy/SDL_nullrender.c	Sat Aug 05 17:09:42 2006 +0000
     9.3 @@ -80,25 +80,25 @@
     9.4      SDL_DUMMY_CreateRenderer,
     9.5      {
     9.6       "dummy",
     9.7 -     (SDL_Renderer_SingleBuffer | SDL_Renderer_PresentCopy |
     9.8 -      SDL_Renderer_PresentFlip2 | SDL_Renderer_PresentFlip3 |
     9.9 -      SDL_Renderer_PresentDiscard),
    9.10 -     (SDL_TextureBlendMode_None | SDL_TextureBlendMode_Mask |
    9.11 -      SDL_TextureBlendMode_Blend),
    9.12 -     (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast),
    9.13 +     (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
    9.14 +      SDL_RENDERER_PRESENTFLIP2 | SDL_RENDERER_PRESENTFLIP3 |
    9.15 +      SDL_RENDERER_PRESENTDISCARD),
    9.16 +     (SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK |
    9.17 +      SDL_TEXTUREBLENDMODE_BLEND),
    9.18 +     (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_FAST),
    9.19       11,
    9.20       {
    9.21 -      SDL_PixelFormat_Index8,
    9.22 -      SDL_PixelFormat_RGB555,
    9.23 -      SDL_PixelFormat_RGB565,
    9.24 -      SDL_PixelFormat_RGB888,
    9.25 -      SDL_PixelFormat_BGR888,
    9.26 -      SDL_PixelFormat_ARGB8888,
    9.27 -      SDL_PixelFormat_RGBA8888,
    9.28 -      SDL_PixelFormat_ABGR8888,
    9.29 -      SDL_PixelFormat_BGRA8888,
    9.30 -      SDL_PixelFormat_YUY2,
    9.31 -      SDL_PixelFormat_UYVY},
    9.32 +      SDL_PIXELFORMAT_INDEX8,
    9.33 +      SDL_PIXELFORMAT_RGB555,
    9.34 +      SDL_PIXELFORMAT_RGB565,
    9.35 +      SDL_PIXELFORMAT_RGB888,
    9.36 +      SDL_PIXELFORMAT_BGR888,
    9.37 +      SDL_PIXELFORMAT_ARGB8888,
    9.38 +      SDL_PIXELFORMAT_RGBA8888,
    9.39 +      SDL_PIXELFORMAT_ABGR8888,
    9.40 +      SDL_PIXELFORMAT_BGRA8888,
    9.41 +      SDL_PIXELFORMAT_YUY2,
    9.42 +      SDL_PIXELFORMAT_UYVY},
    9.43       0,
    9.44       0}
    9.45  };
    9.46 @@ -159,14 +159,14 @@
    9.47  
    9.48      renderer->info.flags = 0;
    9.49  
    9.50 -    if (flags & SDL_Renderer_PresentFlip2) {
    9.51 -        renderer->info.flags |= SDL_Renderer_PresentFlip2;
    9.52 +    if (flags & SDL_RENDERER_PRESENTFLIP2) {
    9.53 +        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
    9.54          n = 2;
    9.55 -    } else if (flags & SDL_Renderer_PresentFlip3) {
    9.56 -        renderer->info.flags |= SDL_Renderer_PresentFlip3;
    9.57 +    } else if (flags & SDL_RENDERER_PRESENTFLIP3) {
    9.58 +        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
    9.59          n = 3;
    9.60      } else {
    9.61 -        renderer->info.flags |= SDL_Renderer_PresentCopy;
    9.62 +        renderer->info.flags |= SDL_RENDERER_PRESENTCOPY;
    9.63          n = 1;
    9.64      }
    9.65      for (i = 0; i < n; ++i) {
    9.66 @@ -364,12 +364,12 @@
    9.67          SDL_Rect real_dstrect = *dstrect;
    9.68  
    9.69          if (blendMode &
    9.70 -            (SDL_TextureBlendMode_Mask | SDL_TextureBlendMode_Blend)) {
    9.71 +            (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND)) {
    9.72              SDL_SetAlpha(surface, SDL_SRCALPHA, 0);
    9.73          } else {
    9.74              SDL_SetAlpha(surface, 0, 0);
    9.75          }
    9.76 -        if (scaleMode != SDL_TextureScaleMode_None &&
    9.77 +        if (scaleMode != SDL_TEXTURESCALEMODE_NONE &&
    9.78              (srcrect->w != dstrect->w || srcrect->h != dstrect->h)) {
    9.79              return SDL_SoftStretch(surface, &real_srcrect, target,
    9.80                                     &real_dstrect);
    9.81 @@ -396,9 +396,9 @@
    9.82      }
    9.83  
    9.84      /* Update the flipping chain, if any */
    9.85 -    if (renderer->info.flags & SDL_Renderer_PresentFlip2) {
    9.86 +    if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
    9.87          data->current_screen = (data->current_screen + 1) % 2;
    9.88 -    } else if (renderer->info.flags & SDL_Renderer_PresentFlip3) {
    9.89 +    } else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
    9.90          data->current_screen = (data->current_screen + 1) % 3;
    9.91      }
    9.92  }
    10.1 --- a/src/video/dummy/SDL_nullvideo.c	Thu Aug 03 19:34:05 2006 +0000
    10.2 +++ b/src/video/dummy/SDL_nullvideo.c	Sat Aug 05 17:09:42 2006 +0000
    10.3 @@ -110,7 +110,7 @@
    10.4      SDL_DisplayMode mode;
    10.5  
    10.6      /* Use a fake 32-bpp desktop mode */
    10.7 -    mode.format = SDL_PixelFormat_RGB888;
    10.8 +    mode.format = SDL_PIXELFORMAT_RGB888;
    10.9      mode.w = 1024;
   10.10      mode.h = 768;
   10.11      mode.refresh_rate = 0;
    11.1 --- a/src/video/win32/SDL_d3drender.c	Thu Aug 03 19:34:05 2006 +0000
    11.2 +++ b/src/video/win32/SDL_d3drender.c	Sat Aug 05 17:09:42 2006 +0000
    11.3 @@ -60,29 +60,29 @@
    11.4      D3D_CreateRenderer,
    11.5      {
    11.6       "d3d",
    11.7 -     (SDL_Renderer_SingleBuffer | SDL_Renderer_PresentCopy |
    11.8 -      SDL_Renderer_PresentFlip2 | SDL_Renderer_PresentFlip3 |
    11.9 -      SDL_Renderer_PresentDiscard | SDL_Renderer_PresentVSync |
   11.10 -      SDL_Renderer_Accelerated),
   11.11 -     (SDL_TextureBlendMode_None | SDL_TextureBlendMode_Mask |
   11.12 -      SDL_TextureBlendMode_Blend | SDL_TextureBlendMode_Add |
   11.13 -      SDL_TextureBlendMode_Mod),
   11.14 -     (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast |
   11.15 -      SDL_TextureScaleMode_Slow | SDL_TextureScaleMode_Best),
   11.16 +     (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
   11.17 +      SDL_RENDERER_PRESENTFLIP2 | sDL_RENDERER_PRESENTFLIP3 |
   11.18 +      SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_PRESENTVSYNC |
   11.19 +      SDL_RENDERER_ACCELERATED),
   11.20 +     (SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK |
   11.21 +      SDL_TEXTUREBLENDMODE_BLEND | SDL_TEXTUREBLENDMODE_ADD |
   11.22 +      SDL_TEXTUREBLENDMODE_MOD),
   11.23 +     (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_FAST |
   11.24 +      SDL_TEXTURESCALEMODE_SLOW | SDL_TEXTURESCALEMODE_BEST),
   11.25       12,
   11.26       {
   11.27 -      SDL_PixelFormat_Index8,
   11.28 -      SDL_PixelFormat_RGB332,
   11.29 -      SDL_PixelFormat_RGB444,
   11.30 -      SDL_PixelFormat_RGB555,
   11.31 -      SDL_PixelFormat_ARGB4444,
   11.32 -      SDL_PixelFormat_ARGB1555,
   11.33 -      SDL_PixelFormat_RGB565,
   11.34 -      SDL_PixelFormat_RGB888,
   11.35 -      SDL_PixelFormat_ARGB8888,
   11.36 -      SDL_PixelFormat_ARGB2101010,
   11.37 -      SDL_PixelFormat_UYVY,
   11.38 -      SDL_PixelFormat_YUY2},
   11.39 +      SDL_PIXELFORMAT_INDEX8,
   11.40 +      SDL_PIXELFORMAT_RGB332,
   11.41 +      SDL_PIXELFORMAT_RGB444,
   11.42 +      SDL_PIXELFORMAT_RGB555,
   11.43 +      SDL_PIXELFORMAT_ARGB4444,
   11.44 +      SDL_PIXELFORMAT_ARGB1555,
   11.45 +      SDL_PIXELFORMAT_RGB565,
   11.46 +      SDL_PIXELFORMAT_RGB888,
   11.47 +      SDL_PIXELFORMAT_ARGB8888,
   11.48 +      SDL_PIXELFORMAT_ARGB2101010,
   11.49 +      SDL_PIXELFORMAT_UYVY,
   11.50 +      SDL_PIXELFORMAT_YUY2},
   11.51       0,
   11.52       0}
   11.53  };
   11.54 @@ -188,29 +188,29 @@
   11.55  PixelFormatToD3DFMT(Uint32 format)
   11.56  {
   11.57      switch (format) {
   11.58 -    case SDL_PixelFormat_Index8:
   11.59 +    case SDL_PIXELFORMAT_INDEX8:
   11.60          return D3DFMT_P8;
   11.61 -    case SDL_PixelFormat_RGB332:
   11.62 +    case SDL_PIXELFORMAT_RGB332:
   11.63          return D3DFMT_R3G3B2;
   11.64 -    case SDL_PixelFormat_RGB444:
   11.65 +    case SDL_PIXELFORMAT_RGB444:
   11.66          return D3DFMT_X4R4G4B4;
   11.67 -    case SDL_PixelFormat_RGB555:
   11.68 +    case SDL_PIXELFORMAT_RGB555:
   11.69          return D3DFMT_X1R5G5B5;
   11.70 -    case SDL_PixelFormat_ARGB4444:
   11.71 +    case SDL_PIXELFORMAT_ARGB4444:
   11.72          return D3DFMT_A4R4G4B4;
   11.73 -    case SDL_PixelFormat_ARGB1555:
   11.74 +    case SDL_PIXELFORMAT_ARGB1555:
   11.75          return D3DFMT_A1R5G5B5;
   11.76 -    case SDL_PixelFormat_RGB565:
   11.77 +    case SDL_PIXELFORMAT_RGB565:
   11.78          return D3DFMT_R5G6B5;
   11.79 -    case SDL_PixelFormat_RGB888:
   11.80 +    case SDL_PIXELFORMAT_RGB888:
   11.81          return D3DFMT_X8R8G8B8;
   11.82 -    case SDL_PixelFormat_ARGB8888:
   11.83 +    case SDL_PIXELFORMAT_ARGB8888:
   11.84          return D3DFMT_A8R8G8B8;
   11.85 -    case SDL_PixelFormat_ARGB2101010:
   11.86 +    case SDL_PIXELFORMAT_ARGB2101010:
   11.87          return D3DFMT_A2R10G10B10;
   11.88 -    case SDL_PixelFormat_UYVY:
   11.89 +    case SDL_PIXELFORMAT_UYVY:
   11.90          return D3DFMT_UYVY;
   11.91 -    case SDL_PixelFormat_YUY2:
   11.92 +    case SDL_PIXELFORMAT_YUY2:
   11.93          return D3DFMT_YUY2;
   11.94      default:
   11.95          return D3DFMT_UNKNOWN;
   11.96 @@ -269,7 +269,7 @@
   11.97      renderer->window = window->id;
   11.98      renderer->driverdata = data;
   11.99  
  11.100 -    renderer->info.flags = SDL_Renderer_Accelerated;
  11.101 +    renderer->info.flags = SDL_RENDERER_ACCELERATED;
  11.102  
  11.103      SDL_zero(pparams);
  11.104      pparams.BackBufferWidth = window->w;
  11.105 @@ -280,13 +280,13 @@
  11.106      } else {
  11.107          pparams.BackBufferFormat = D3DFMT_UNKNOWN;
  11.108      }
  11.109 -    if (flags & SDL_Renderer_PresentFlip2) {
  11.110 +    if (flags & SDL_RENDERER_PRESENTFLIP2) {
  11.111          pparams.BackBufferCount = 2;
  11.112          pparams.SwapEffect = D3DSWAPEFFECT_FLIP;
  11.113 -    } else if (flags & SDL_Renderer_PresentFlip3) {
  11.114 +    } else if (flags & SDL_RENDERER_PRESENTFLIP3) {
  11.115          pparams.BackBufferCount = 3;
  11.116          pparams.SwapEffect = D3DSWAPEFFECT_FLIP;
  11.117 -    } else if (flags & SDL_Renderer_PresentCopy) {
  11.118 +    } else if (flags & SDL_RENDERER_PRESENTCOPY) {
  11.119          pparams.BackBufferCount = 1;
  11.120          pparams.SwapEffect = D3DSWAPEFFECT_COPY;
  11.121      } else {
  11.122 @@ -301,7 +301,7 @@
  11.123          pparams.Windowed = TRUE;
  11.124          pparams.FullScreen_RefreshRateInHz = 0;
  11.125      }
  11.126 -    if (flags & SDL_Renderer_PresentVSync) {
  11.127 +    if (flags & SDL_RENDERER_PRESENTVSYNC) {
  11.128          pparams.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
  11.129      } else {
  11.130          pparams.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
  11.131 @@ -336,24 +336,24 @@
  11.132      IDirect3DSwapChain9_Release(chain);
  11.133      switch (pparams.SwapEffect) {
  11.134      case D3DSWAPEFFECT_COPY:
  11.135 -        renderer->info.flags |= SDL_Renderer_PresentCopy;
  11.136 +        renderer->info.flags |= SDL_RENDERER_PRESENTCOPY;
  11.137          break;
  11.138      case D3DSWAPEFFECT_FLIP:
  11.139          switch (pparams.BackBufferCount) {
  11.140          case 2:
  11.141 -            renderer->info.flags |= SDL_Renderer_PresentFlip2;
  11.142 +            renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
  11.143              break;
  11.144          case 3:
  11.145 -            renderer->info.flags |= SDL_Renderer_PresentFlip3;
  11.146 +            renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
  11.147              break;
  11.148          }
  11.149          break;
  11.150      case D3DSWAPEFFECT_DISCARD:
  11.151 -        renderer->info.flags |= SDL_Renderer_PresentDiscard;
  11.152 +        renderer->info.flags |= SDL_RENDERER_PRESENTDISCARD;
  11.153          break;
  11.154      }
  11.155      if (pparams.PresentationInterval == D3DPRESENT_INTERVAL_ONE) {
  11.156 -        renderer->info.flags |= SDL_Renderer_PresentVSync;
  11.157 +        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
  11.158      }
  11.159  
  11.160      IDirect3DDevice9_GetDeviceCaps(data->device, &caps);
  11.161 @@ -388,7 +388,7 @@
  11.162  
  11.163      texture->driverdata = data;
  11.164  
  11.165 -    if (texture->access == SDL_TextureAccess_Local) {
  11.166 +    if (texture->access == SDL_TEXTUREACCESS_LOCAL) {
  11.167          pool = D3DPOOL_MANAGED;
  11.168      } else {
  11.169          pool = D3DPOOL_DEFAULT;
  11.170 @@ -494,7 +494,7 @@
  11.171      D3DLOCKED_RECT locked;
  11.172      HRESULT result;
  11.173  
  11.174 -    if (texture->access != SDL_TextureAccess_Local) {
  11.175 +    if (texture->access != SDL_TEXTUREACCESS_LOCAL) {
  11.176          SDL_SetError("Can't lock remote video memory");
  11.177          return -1;
  11.178      }
  11.179 @@ -627,12 +627,12 @@
  11.180      vertices[3].v = maxv;
  11.181  
  11.182      switch (blendMode) {
  11.183 -    case SDL_TextureBlendMode_None:
  11.184 +    case SDL_TEXTUREBLENDMODE_NONE:
  11.185          IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
  11.186                                          FALSE);
  11.187          break;
  11.188 -    case SDL_TextureBlendMode_Mask:
  11.189 -    case SDL_TextureBlendMode_Blend:
  11.190 +    case SDL_TEXTUREBLENDMODE_MASK:
  11.191 +    case SDL_TEXTUREBLENDMODE_BLEND:
  11.192          IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
  11.193                                          TRUE);
  11.194          IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLEND,
  11.195 @@ -640,7 +640,7 @@
  11.196          IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLEND,
  11.197                                          D3DBLEND_INVSRCALPHA);
  11.198          break;
  11.199 -    case SDL_TextureBlendMode_Add:
  11.200 +    case SDL_TEXTUREBLENDMODE_ADD:
  11.201          IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
  11.202                                          TRUE);
  11.203          IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLEND,
  11.204 @@ -648,7 +648,7 @@
  11.205          IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLEND,
  11.206                                          D3DBLEND_ONE);
  11.207          break;
  11.208 -    case SDL_TextureBlendMode_Mod:
  11.209 +    case SDL_TEXTUREBLENDMODE_MOD:
  11.210          IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
  11.211                                          TRUE);
  11.212          IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLEND,
  11.213 @@ -659,20 +659,20 @@
  11.214      }
  11.215  
  11.216      switch (scaleMode) {
  11.217 -    case SDL_TextureScaleMode_None:
  11.218 -    case SDL_TextureScaleMode_Fast:
  11.219 +    case SDL_TEXTURESCALEMODE_NONE:
  11.220 +    case SDL_TEXTURESCALEMODE_FAST:
  11.221          IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MINFILTER,
  11.222                                           D3DTEXF_POINT);
  11.223          IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MAGFILTER,
  11.224                                           D3DTEXF_POINT);
  11.225          break;
  11.226 -    case SDL_TextureScaleMode_Slow:
  11.227 +    case SDL_TEXTURESCALEMODE_SLOW:
  11.228          IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MINFILTER,
  11.229                                           D3DTEXF_LINEAR);
  11.230          IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MAGFILTER,
  11.231                                           D3DTEXF_LINEAR);
  11.232          break;
  11.233 -    case SDL_TextureScaleMode_Best:
  11.234 +    case SDL_TEXTURESCALEMODE_BEST:
  11.235          IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MINFILTER,
  11.236                                           D3DTEXF_GAUSSIANQUAD);
  11.237          IDirect3DDevice9_SetSamplerState(data->device, 0, D3DSAMP_MAGFILTER,
    12.1 --- a/src/video/win32/SDL_gdirender.c	Thu Aug 03 19:34:05 2006 +0000
    12.2 +++ b/src/video/win32/SDL_gdirender.c	Sat Aug 05 17:09:42 2006 +0000
    12.3 @@ -65,25 +65,25 @@
    12.4      GDI_CreateRenderer,
    12.5      {
    12.6       "gdi",
    12.7 -     (SDL_Renderer_SingleBuffer | SDL_Renderer_PresentCopy |
    12.8 -      SDL_Renderer_PresentFlip2 | SDL_Renderer_PresentFlip3 |
    12.9 -      SDL_Renderer_PresentDiscard | SDL_Renderer_Accelerated),
   12.10 -     (SDL_TextureBlendMode_None | SDL_TextureBlendMode_Mask |
   12.11 -      SDL_TextureBlendMode_Blend),
   12.12 -     (SDL_TextureScaleMode_None | SDL_TextureScaleMode_Fast),
   12.13 +     (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTCOPY |
   12.14 +      SDL_RENDERER_PRESENTFLIP2 | sDL_RENDERER_PRESENTFLIP3 |
   12.15 +      SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED),
   12.16 +     (SDL_TEXTUREBLENDMODE_NONE | SDL_TEXTUREBLENDMODE_MASK |
   12.17 +      SDL_TEXTUREBLENDMODE_BLEND),
   12.18 +     (SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_FAST),
   12.19       11,
   12.20       {
   12.21 -      SDL_PixelFormat_Index8,
   12.22 -      SDL_PixelFormat_RGB555,
   12.23 -      SDL_PixelFormat_RGB565,
   12.24 -      SDL_PixelFormat_RGB888,
   12.25 -      SDL_PixelFormat_BGR888,
   12.26 -      SDL_PixelFormat_ARGB8888,
   12.27 -      SDL_PixelFormat_RGBA8888,
   12.28 -      SDL_PixelFormat_ABGR8888,
   12.29 -      SDL_PixelFormat_BGRA8888,
   12.30 -      SDL_PixelFormat_YUY2,
   12.31 -      SDL_PixelFormat_UYVY},
   12.32 +      SDL_PIXELFORMAT_INDEX8,
   12.33 +      SDL_PIXELFORMAT_RGB555,
   12.34 +      SDL_PIXELFORMAT_RGB565,
   12.35 +      SDL_PIXELFORMAT_RGB888,
   12.36 +      SDL_PIXELFORMAT_BGR888,
   12.37 +      SDL_PIXELFORMAT_ARGB8888,
   12.38 +      SDL_PIXELFORMAT_RGBA8888,
   12.39 +      SDL_PIXELFORMAT_ABGR8888,
   12.40 +      SDL_PIXELFORMAT_BGRA8888,
   12.41 +      SDL_PIXELFORMAT_YUY2,
   12.42 +      SDL_PIXELFORMAT_UYVY},
   12.43       0,
   12.44       0}
   12.45  };
   12.46 @@ -172,7 +172,7 @@
   12.47      renderer->window = window->id;
   12.48      renderer->driverdata = data;
   12.49  
   12.50 -    renderer->info.flags = SDL_Renderer_Accelerated;
   12.51 +    renderer->info.flags = SDL_RENDERER_ACCELERATED;
   12.52  
   12.53      data->hwnd = windowdata->hwnd;
   12.54      data->window_hdc = windowdata->hdc;
   12.55 @@ -194,18 +194,18 @@
   12.56      GetDIBits(data->window_hdc, hbm, 0, 1, NULL, data->bmi, DIB_RGB_COLORS);
   12.57      DeleteObject(hbm);
   12.58  
   12.59 -    if (flags & SDL_Renderer_SingleBuffer) {
   12.60 +    if (flags & SDL_RENDERER_SINGLEBUFFER) {
   12.61          renderer->info.flags |=
   12.62 -            (SDL_Renderer_SingleBuffer | SDL_Renderer_PresentCopy);
   12.63 +            (SDL_RENDERER_SINGLEBUFFER | sDL_RENDERER_PRESENTCOPY);
   12.64          n = 0;
   12.65 -    } else if (flags & SDL_Renderer_PresentFlip2) {
   12.66 -        renderer->info.flags |= SDL_Renderer_PresentFlip2;
   12.67 +    } else if (flags & SDL_RENDERER_PRESENTFLIP2) {
   12.68 +        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
   12.69          n = 2;
   12.70 -    } else if (flags & SDL_Renderer_PresentFlip3) {
   12.71 -        renderer->info.flags |= SDL_Renderer_PresentFlip3;
   12.72 +    } else if (flags & SDL_RENDERER_PRESENTFLIP3) {
   12.73 +        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
   12.74          n = 3;
   12.75      } else {
   12.76 -        renderer->info.flags |= SDL_Renderer_PresentCopy;
   12.77 +        renderer->info.flags |= SDL_RENDERER_PRESENTCOPY;
   12.78          n = 1;
   12.79      }
   12.80      for (i = 0; i < n; ++i) {
   12.81 @@ -257,7 +257,7 @@
   12.82      }
   12.83      data->pitch = (texture->w * SDL_BYTESPERPIXEL(data->format));
   12.84  
   12.85 -    if (data->yuv || texture->access == SDL_TextureAccess_Local
   12.86 +    if (data->yuv || texture->access == SDL_TEXTUREACCESS_LOCAL
   12.87          || texture->format != SDL_GetCurrentDisplayMode()->format) {
   12.88          int bmi_size;
   12.89          LPBITMAPINFO bmi;
   12.90 @@ -537,7 +537,7 @@
   12.91          SelectPalette(data->memory_hdc, texturedata->hpal, TRUE);
   12.92          RealizePalette(data->memory_hdc);
   12.93      }
   12.94 -    if (blendMode & (SDL_TextureBlendMode_Mask | SDL_TextureBlendMode_Blend)) {
   12.95 +    if (blendMode & (SDL_TEXTUREBLENDMODE_MASK | SDL_TEXTUREBLENDMODE_BLEND)) {
   12.96          static BLENDFUNCTION blendFunc = {
   12.97              AC_SRC_OVER,
   12.98              0,
   12.99 @@ -581,7 +581,7 @@
  12.100      SDL_DirtyRect *dirty;
  12.101  
  12.102      /* Send the data to the display */
  12.103 -    if (!(renderer->info.flags & SDL_Renderer_SingleBuffer)) {
  12.104 +    if (!(renderer->info.flags & SDL_RENDERER_SINGLEBUFFER)) {
  12.105          for (dirty = data->dirty.list; dirty; dirty = dirty->next) {
  12.106              const SDL_Rect *rect = &dirty->rect;
  12.107              BitBlt(data->window_hdc, rect->x, rect->y, rect->w, rect->h,
  12.108 @@ -591,10 +591,10 @@
  12.109      }
  12.110  
  12.111      /* Update the flipping chain, if any */
  12.112 -    if (renderer->info.flags & SDL_Renderer_PresentFlip2) {
  12.113 +    if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP2) {
  12.114          data->current_hbm = (data->current_hbm + 1) % 2;
  12.115          SelectObject(data->render_hdc, data->hbm[data->current_hbm]);
  12.116 -    } else if (renderer->info.flags & SDL_Renderer_PresentFlip3) {
  12.117 +    } else if (renderer->info.flags & SDL_RENDERER_PRESENTFLIP3) {
  12.118          data->current_hbm = (data->current_hbm + 1) % 3;
  12.119          SelectObject(data->render_hdc, data->hbm[data->current_hbm]);
  12.120      }
    13.1 --- a/src/video/win32/SDL_win32modes.c	Thu Aug 03 19:34:05 2006 +0000
    13.2 +++ b/src/video/win32/SDL_win32modes.c	Sat Aug 05 17:09:42 2006 +0000
    13.3 @@ -48,7 +48,7 @@
    13.4           DM_DISPLAYFLAGS);
    13.5  
    13.6      /* Fill in the mode information */
    13.7 -    mode->format = SDL_PixelFormat_Unknown;
    13.8 +    mode->format = SDL_PIXELFORMAT_UNKNOWN;
    13.9      mode->w = devmode.dmPelsWidth;
   13.10      mode->h = devmode.dmPelsHeight;
   13.11      mode->refresh_rate = devmode.dmDisplayFrequency;
   13.12 @@ -72,38 +72,38 @@
   13.13          if (bmi->bmiHeader.biCompression == BI_BITFIELDS) {
   13.14              switch (*(Uint32 *) bmi->bmiColors) {
   13.15              case 0x00FF0000:
   13.16 -                mode->format = SDL_PixelFormat_RGB888;
   13.17 +                mode->format = SDL_PIXELFORMAT_RGB888;
   13.18                  break;
   13.19              case 0x000000FF:
   13.20 -                mode->format = SDL_PixelFormat_BGR888;
   13.21 +                mode->format = SDL_PIXELFORMAT_BGR888;
   13.22                  break;
   13.23              case 0xF800:
   13.24 -                mode->format = SDL_PixelFormat_RGB565;
   13.25 +                mode->format = SDL_PIXELFORMAT_RGB565;
   13.26                  break;
   13.27              case 0x7C00:
   13.28 -                mode->format = SDL_PixelFormat_RGB555;
   13.29 +                mode->format = SDL_PIXELFORMAT_RGB555;
   13.30                  break;
   13.31              }
   13.32          } else if (bmi->bmiHeader.biBitCount == 8) {
   13.33 -            mode->format = SDL_PixelFormat_Index8;
   13.34 +            mode->format = SDL_PIXELFORMAT_INDEX8;
   13.35          }
   13.36      } else {
   13.37          /* FIXME: Can we tell what this will be? */
   13.38          switch (devmode.dmBitsPerPel) {
   13.39          case 32:
   13.40 -            mode->format = SDL_PixelFormat_RGB888;
   13.41 +            mode->format = SDL_PIXELFORMAT_RGB888;
   13.42              break;
   13.43          case 24:
   13.44 -            mode->format = SDL_PixelFormat_RGB24;
   13.45 +            mode->format = SDL_PIXELFORMAT_RGB24;
   13.46              break;
   13.47          case 16:
   13.48 -            mode->format = SDL_PixelFormat_RGB565;
   13.49 +            mode->format = SDL_PIXELFORMAT_RGB565;
   13.50              break;
   13.51          case 15:
   13.52 -            mode->format = SDL_PixelFormat_RGB555;
   13.53 +            mode->format = SDL_PIXELFORMAT_RGB555;
   13.54              break;
   13.55          case 8:
   13.56 -            mode->format = SDL_PixelFormat_Index8;
   13.57 +            mode->format = SDL_PIXELFORMAT_INDEX8;
   13.58              break;
   13.59          }
   13.60      }
    14.1 --- a/test/common.c	Thu Aug 03 19:34:05 2006 +0000
    14.2 +++ b/test/common.c	Sat Aug 05 17:09:42 2006 +0000
    14.3 @@ -170,7 +170,7 @@
    14.4          return 2;
    14.5      }
    14.6      if (SDL_strcasecmp(argv[index], "--vsync") == 0) {
    14.7 -        state->render_flags |= SDL_Renderer_PresentVSync;
    14.8 +        state->render_flags |= SDL_RENDERER_PRESENTVSYNC;
    14.9          return 1;
   14.10      }
   14.11      if (SDL_strcasecmp(argv[index], "--noframe") == 0) {
   14.12 @@ -283,25 +283,25 @@
   14.13  PrintRendererFlag(Uint32 flag)
   14.14  {
   14.15      switch (flag) {
   14.16 -    case SDL_Renderer_SingleBuffer:
   14.17 +    case SDL_RENDERER_SINGLEBUFFER:
   14.18          fprintf(stderr, "SingleBuffer");
   14.19          break;
   14.20 -    case SDL_Renderer_PresentCopy:
   14.21 +    case SDL_RENDERER_PRESENTCOPY:
   14.22          fprintf(stderr, "PresentCopy");
   14.23          break;
   14.24 -    case SDL_Renderer_PresentFlip2:
   14.25 +    case SDL_RENDERER_PRESENTFLIP2:
   14.26          fprintf(stderr, "PresentFlip2");
   14.27          break;
   14.28 -    case SDL_Renderer_PresentFlip3:
   14.29 +    case SDL_RENDERER_PRESENTFLIP3:
   14.30          fprintf(stderr, "PresentFlip3");
   14.31          break;
   14.32 -    case SDL_Renderer_PresentDiscard:
   14.33 +    case SDL_RENDERER_PRESENTDISCARD:
   14.34          fprintf(stderr, "PresentDiscard");
   14.35          break;
   14.36 -    case SDL_Renderer_PresentVSync:
   14.37 +    case SDL_RENDERER_PRESENTVSYNC:
   14.38          fprintf(stderr, "PresentVSync");
   14.39          break;
   14.40 -    case SDL_Renderer_Accelerated:
   14.41 +    case SDL_RENDERER_ACCELERATED:
   14.42          fprintf(stderr, "Accelerated");
   14.43          break;
   14.44      default:
   14.45 @@ -314,19 +314,19 @@
   14.46  PrintBlendMode(Uint32 flag)
   14.47  {
   14.48      switch (flag) {
   14.49 -    case SDL_TextureBlendMode_None:
   14.50 +    case SDL_TEXTUREBLENDMODE_NONE:
   14.51          fprintf(stderr, "None");
   14.52          break;
   14.53 -    case SDL_TextureBlendMode_Mask:
   14.54 +    case SDL_TEXTUREBLENDMODE_MASK:
   14.55          fprintf(stderr, "Mask");
   14.56          break;
   14.57 -    case SDL_TextureBlendMode_Blend:
   14.58 +    case SDL_TEXTUREBLENDMODE_BLEND:
   14.59          fprintf(stderr, "Blend");
   14.60          break;
   14.61 -    case SDL_TextureBlendMode_Add:
   14.62 +    case SDL_TEXTUREBLENDMODE_ADD:
   14.63          fprintf(stderr, "Add");
   14.64          break;
   14.65 -    case SDL_TextureBlendMode_Mod:
   14.66 +    case SDL_TEXTUREBLENDMODE_MOD:
   14.67          fprintf(stderr, "Mod");
   14.68          break;
   14.69      default:
   14.70 @@ -339,16 +339,16 @@
   14.71  PrintScaleMode(Uint32 flag)
   14.72  {
   14.73      switch (flag) {
   14.74 -    case SDL_TextureScaleMode_None:
   14.75 +    case SDL_TEXTURESCALEMODE_NONE:
   14.76          fprintf(stderr, "None");
   14.77          break;
   14.78 -    case SDL_TextureScaleMode_Fast:
   14.79 +    case SDL_TEXTURESCALEMODE_FAST:
   14.80          fprintf(stderr, "Fast");
   14.81          break;
   14.82 -    case SDL_TextureScaleMode_Slow:
   14.83 +    case SDL_TEXTURESCALEMODE_SLOW:
   14.84          fprintf(stderr, "Slow");
   14.85          break;
   14.86 -    case SDL_TextureScaleMode_Best:
   14.87 +    case SDL_TEXTURESCALEMODE_BEST:
   14.88          fprintf(stderr, "Best");
   14.89          break;
   14.90      default:
   14.91 @@ -361,82 +361,82 @@
   14.92  PrintPixelFormat(Uint32 format)
   14.93  {
   14.94      switch (format) {
   14.95 -    case SDL_PixelFormat_Unknown:
   14.96 +    case SDL_PIXELFORMAT_UNKNOWN:
   14.97          fprintf(stderr, "Unknwon");
   14.98          break;
   14.99 -    case SDL_PixelFormat_Index1LSB:
  14.100 +    case SDL_PIXELFORMAT_INDEX1LSB:
  14.101          fprintf(stderr, "Index1LSB");
  14.102          break;
  14.103 -    case SDL_PixelFormat_Index1MSB:
  14.104 +    case SDL_PIXELFORMAT_INDEX1MSB:
  14.105          fprintf(stderr, "Index1MSB");
  14.106          break;
  14.107 -    case SDL_PixelFormat_Index4LSB:
  14.108 +    case SDL_PIXELFORMAT_INDEX4LSB:
  14.109          fprintf(stderr, "Index4LSB");
  14.110          break;
  14.111 -    case SDL_PixelFormat_Index4MSB:
  14.112 +    case SDL_PIXELFORMAT_INDEX4MSB:
  14.113          fprintf(stderr, "Index4MSB");
  14.114          break;
  14.115 -    case SDL_PixelFormat_Index8:
  14.116 +    case SDL_PIXELFORMAT_INDEX8:
  14.117          fprintf(stderr, "Index8");
  14.118          break;
  14.119 -    case SDL_PixelFormat_RGB332:
  14.120 +    case SDL_PIXELFORMAT_RGB332:
  14.121          fprintf(stderr, "RGB332");
  14.122          break;
  14.123 -    case SDL_PixelFormat_RGB444:
  14.124 +    case SDL_PIXELFORMAT_RGB444:
  14.125          fprintf(stderr, "RGB444");
  14.126          break;
  14.127 -    case SDL_PixelFormat_RGB555:
  14.128 +    case SDL_PIXELFORMAT_RGB555:
  14.129          fprintf(stderr, "RGB555");
  14.130          break;
  14.131 -    case SDL_PixelFormat_ARGB4444:
  14.132 +    case SDL_PIXELFORMAT_ARGB4444:
  14.133          fprintf(stderr, "ARGB4444");
  14.134          break;
  14.135 -    case SDL_PixelFormat_ARGB1555:
  14.136 +    case SDL_PIXELFORMAT_ARGB1555:
  14.137          fprintf(stderr, "ARGB1555");
  14.138          break;
  14.139 -    case SDL_PixelFormat_RGB565:
  14.140 +    case SDL_PIXELFORMAT_RGB565:
  14.141          fprintf(stderr, "RGB565");
  14.142          break;
  14.143 -    case SDL_PixelFormat_RGB24:
  14.144 +    case SDL_PIXELFORMAT_RGB24:
  14.145          fprintf(stderr, "RGB24");
  14.146          break;
  14.147 -    case SDL_PixelFormat_BGR24:
  14.148 +    case SDL_PIXELFORMAT_BGR24:
  14.149          fprintf(stderr, "BGR24");
  14.150          break;
  14.151 -    case SDL_PixelFormat_RGB888:
  14.152 +    case SDL_PIXELFORMAT_RGB888:
  14.153          fprintf(stderr, "RGB888");
  14.154          break;
  14.155 -    case SDL_PixelFormat_BGR888:
  14.156 +    case SDL_PIXELFORMAT_BGR888:
  14.157          fprintf(stderr, "BGR888");
  14.158          break;
  14.159 -    case SDL_PixelFormat_ARGB8888:
  14.160 +    case SDL_PIXELFORMAT_ARGB8888:
  14.161          fprintf(stderr, "ARGB8888");
  14.162          break;
  14.163 -    case SDL_PixelFormat_RGBA8888:
  14.164 +    case SDL_PIXELFORMAT_RGBA8888:
  14.165          fprintf(stderr, "RGBA8888");
  14.166          break;
  14.167 -    case SDL_PixelFormat_ABGR8888:
  14.168 +    case SDL_PIXELFORMAT_ABGR8888:
  14.169          fprintf(stderr, "ABGR8888");
  14.170          break;
  14.171 -    case SDL_PixelFormat_BGRA8888:
  14.172 +    case SDL_PIXELFORMAT_BGRA8888:
  14.173          fprintf(stderr, "BGRA8888");
  14.174          break;
  14.175 -    case SDL_PixelFormat_ARGB2101010:
  14.176 +    case SDL_PIXELFORMAT_ARGB2101010:
  14.177          fprintf(stderr, "ARGB2101010");
  14.178          break;
  14.179 -    case SDL_PixelFormat_YV12:
  14.180 +    case SDL_PIXELFORMAT_YV12:
  14.181          fprintf(stderr, "YV12");
  14.182          break;
  14.183 -    case SDL_PixelFormat_IYUV:
  14.184 +    case SDL_PIXELFORMAT_IYUV:
  14.185          fprintf(stderr, "IYUV");
  14.186          break;
  14.187 -    case SDL_PixelFormat_YUY2:
  14.188 +    case SDL_PIXELFORMAT_YUY2:
  14.189          fprintf(stderr, "YUY2");
  14.190          break;
  14.191 -    case SDL_PixelFormat_UYVY:
  14.192 +    case SDL_PIXELFORMAT_UYVY:
  14.193          fprintf(stderr, "UYVY");
  14.194          break;
  14.195 -    case SDL_PixelFormat_YVYU:
  14.196 +    case SDL_PIXELFORMAT_YVYU:
  14.197          fprintf(stderr, "YVYU");
  14.198          break;
  14.199      default:
  14.200 @@ -617,16 +617,16 @@
  14.201  
  14.202          switch (state->depth) {
  14.203          case 8:
  14.204 -            fullscreen_mode.format = SDL_PixelFormat_Index8;
  14.205 +            fullscreen_mode.format = SDL_PIXELFORMAT_INDEX8;
  14.206              break;
  14.207          case 15:
  14.208 -            fullscreen_mode.format = SDL_PixelFormat_RGB555;
  14.209 +            fullscreen_mode.format = SDL_PIXELFORMAT_RGB555;
  14.210              break;
  14.211          case 16:
  14.212 -            fullscreen_mode.format = SDL_PixelFormat_RGB565;
  14.213 +            fullscreen_mode.format = SDL_PIXELFORMAT_RGB565;
  14.214              break;
  14.215          default:
  14.216 -            fullscreen_mode.format = SDL_PixelFormat_RGB888;
  14.217 +            fullscreen_mode.format = SDL_PIXELFORMAT_RGB888;
  14.218              break;
  14.219          }
  14.220          fullscreen_mode.w = state->window_w;
  14.221 @@ -909,6 +909,11 @@
  14.222      case SDL_KEYDOWN:
  14.223          switch (event->key.keysym.sym) {
  14.224              /* Add hotkeys here */
  14.225 +        case SDLK_g:
  14.226 +            if (event->key.keysym.mod & KMOD_CTRL) {
  14.227 +                /* Ctrl-G toggle grab */
  14.228 +            }
  14.229 +            break;
  14.230          case SDLK_ESCAPE:
  14.231              *done = 1;
  14.232              break;
    15.1 --- a/test/testgl2.c	Thu Aug 03 19:34:05 2006 +0000
    15.2 +++ b/test/testgl2.c	Sat Aug 05 17:09:42 2006 +0000
    15.3 @@ -229,7 +229,7 @@
    15.4          quit(2);
    15.5      }
    15.6  
    15.7 -    if (state->render_flags & SDL_Renderer_PresentVSync) {
    15.8 +    if (state->render_flags & SDL_RENDERER_PRESENTVSYNC) {
    15.9          SDL_GL_SetSwapInterval(1);
   15.10      } else {
   15.11          SDL_GL_SetSwapInterval(0);
    16.1 --- a/test/testsprite2.c	Thu Aug 03 19:34:05 2006 +0000
    16.2 +++ b/test/testsprite2.c	Sat Aug 05 17:09:42 2006 +0000
    16.3 @@ -16,8 +16,8 @@
    16.4  static SDL_Rect *positions;
    16.5  static SDL_Rect *velocities;
    16.6  static int sprite_w, sprite_h;
    16.7 -static SDL_TextureBlendMode blendMode = SDL_TextureBlendMode_Mask;
    16.8 -static SDL_TextureScaleMode scaleMode = SDL_TextureScaleMode_None;
    16.9 +static SDL_TextureBlendMode blendMode = SDL_TEXTUREBLENDMODE_MASK;
   16.10 +static SDL_TextureScaleMode scaleMode = SDL_TEXTURESCALEMODE_NONE;
   16.11  
   16.12  /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
   16.13  static void
   16.14 @@ -60,7 +60,7 @@
   16.15      for (i = 0; i < state->num_windows; ++i) {
   16.16          SDL_SelectRenderer(state->windows[i]);
   16.17          sprites[i] =
   16.18 -            SDL_CreateTextureFromSurface(0, SDL_TextureAccess_Remote, temp);
   16.19 +            SDL_CreateTextureFromSurface(0, SDL_TEXTUREACCESS_REMOTE, temp);
   16.20          if (!sprites[i]) {
   16.21              fprintf(stderr, "Couldn't create texture: %s\n", SDL_GetError());
   16.22              SDL_FreeSurface(temp);
   16.23 @@ -134,35 +134,35 @@
   16.24              if (SDL_strcasecmp(argv[i], "--blend") == 0) {
   16.25                  if (argv[i + 1]) {
   16.26                      if (SDL_strcasecmp(argv[i + 1], "none") == 0) {
   16.27 -                        blendMode = SDL_TextureBlendMode_None;
   16.28 +                        blendMode = SDL_TEXTUREBLENDMODE_NONE;
   16.29                          consumed = 2;
   16.30                      } else if (SDL_strcasecmp(argv[i + 1], "mask") == 0) {
   16.31 -                        blendMode = SDL_TextureBlendMode_Mask;
   16.32 +                        blendMode = SDL_TEXTUREBLENDMODE_MASK;
   16.33                          consumed = 2;
   16.34                      } else if (SDL_strcasecmp(argv[i + 1], "blend") == 0) {
   16.35 -                        blendMode = SDL_TextureBlendMode_Blend;
   16.36 +                        blendMode = SDL_TEXTUREBLENDMODE_BLEND;
   16.37                          consumed = 2;
   16.38                      } else if (SDL_strcasecmp(argv[i + 1], "add") == 0) {
   16.39 -                        blendMode = SDL_TextureBlendMode_Add;
   16.40 +                        blendMode = SDL_TEXTUREBLENDMODE_ADD;
   16.41                          consumed = 2;
   16.42                      } else if (SDL_strcasecmp(argv[i + 1], "mod") == 0) {
   16.43 -                        blendMode = SDL_TextureBlendMode_Mod;
   16.44 +                        blendMode = SDL_TEXTUREBLENDMODE_MOD;
   16.45                          consumed = 2;
   16.46                      }
   16.47                  }
   16.48              } else if (SDL_strcasecmp(argv[i], "--scale") == 0) {
   16.49                  if (argv[i + 1]) {
   16.50                      if (SDL_strcasecmp(argv[i + 1], "none") == 0) {
   16.51 -                        scaleMode = SDL_TextureScaleMode_None;
   16.52 +                        scaleMode = SDL_TEXTURESCALEMODE_NONE;
   16.53                          consumed = 2;
   16.54                      } else if (SDL_strcasecmp(argv[i + 1], "fast") == 0) {
   16.55 -                        scaleMode = SDL_TextureScaleMode_Fast;
   16.56 +                        scaleMode = SDL_TEXTURESCALEMODE_FAST;
   16.57                          consumed = 2;
   16.58                      } else if (SDL_strcasecmp(argv[i + 1], "slow") == 0) {
   16.59 -                        scaleMode = SDL_TextureScaleMode_Slow;
   16.60 +                        scaleMode = SDL_TEXTURESCALEMODE_SLOW;
   16.61                          consumed = 2;
   16.62                      } else if (SDL_strcasecmp(argv[i + 1], "best") == 0) {
   16.63 -                        scaleMode = SDL_TextureScaleMode_Best;
   16.64 +                        scaleMode = SDL_TEXTURESCALEMODE_BEST;
   16.65                          consumed = 2;
   16.66                      }
   16.67                  }
   16.68 @@ -206,7 +206,7 @@
   16.69          quit(2);
   16.70      }
   16.71      srand(time(NULL));
   16.72 -    if (scaleMode != SDL_TextureScaleMode_None) {
   16.73 +    if (scaleMode != SDL_TEXTURESCALEMODE_NONE) {
   16.74          sprite_w += sprite_w / 2;
   16.75          sprite_h += sprite_h / 2;
   16.76      }