|
@@ -87,17 +87,11 @@ typedef enum
|
|
|
} SDL_PackedOrder;
|
|
|
|
|
|
/** Array component order, low byte -> high byte. */
|
|
|
-/* !!! FIXME: in 2.1, make these not overlap differently with
|
|
|
- !!! FIXME: SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */
|
|
|
typedef enum
|
|
|
{
|
|
|
SDL_ARRAYORDER_NONE,
|
|
|
SDL_ARRAYORDER_RGB,
|
|
|
- SDL_ARRAYORDER_RGBA,
|
|
|
- SDL_ARRAYORDER_ARGB,
|
|
|
SDL_ARRAYORDER_BGR,
|
|
|
- SDL_ARRAYORDER_BGRA,
|
|
|
- SDL_ARRAYORDER_ABGR
|
|
|
} SDL_ArrayOrder;
|
|
|
|
|
|
/** Packed component layout. */
|
|
@@ -156,12 +150,7 @@ typedef enum
|
|
|
((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \
|
|
|
(SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \
|
|
|
(SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \
|
|
|
- (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA))) || \
|
|
|
- (SDL_ISPIXELFORMAT_ARRAY(format) && \
|
|
|
- ((SDL_PIXELORDER(format) == SDL_ARRAYORDER_ARGB) || \
|
|
|
- (SDL_PIXELORDER(format) == SDL_ARRAYORDER_RGBA) || \
|
|
|
- (SDL_PIXELORDER(format) == SDL_ARRAYORDER_ABGR) || \
|
|
|
- (SDL_PIXELORDER(format) == SDL_ARRAYORDER_BGRA))))
|
|
|
+ (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA))))
|
|
|
|
|
|
/* The flag is set to 1 because 0x1? is not in the printable ASCII range */
|
|
|
#define SDL_ISPIXELFORMAT_FOURCC(format) \
|