Mercurial > sdl-ios-xcode
view src/video/qnxgf/SDL_gf_pixelfmt.c @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | f7b03b6838cb |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2010 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org QNX Graphics Framework SDL driver Copyright (C) 2009 Mike Gorchak (mike@malva.ua, lestat@i.com.ua) */ #include "SDL_config.h" #include "SDL_gf_pixelfmt.h" gf_format_t qnxgf_sdl_to_gf_pixelformat(uint32_t pixelfmt) { switch (pixelfmt) { case SDL_PIXELFORMAT_INDEX8: { return GF_FORMAT_PAL8; } break; case SDL_PIXELFORMAT_ARGB1555: { return GF_FORMAT_PACK_ARGB1555; } break; case SDL_PIXELFORMAT_RGB555: { /* RGB555 is the same as ARGB1555, but alpha is ignored */ return GF_FORMAT_PACK_ARGB1555; } break; case SDL_PIXELFORMAT_RGB565: { return GF_FORMAT_PACK_RGB565; } break; case SDL_PIXELFORMAT_BGR565: { return GF_FORMAT_PKBE_RGB565; } break; case SDL_PIXELFORMAT_RGB24: { /* GF has wrong components order */ return GF_FORMAT_BGR888; } break; case SDL_PIXELFORMAT_RGB888: { /* The same format as ARGB8888, but with alpha ignored */ /* and GF has wrong components order */ return GF_FORMAT_BGRA8888; } break; case SDL_PIXELFORMAT_ARGB8888: { /* GF has wrong components order */ return GF_FORMAT_BGRA8888; } break; case SDL_PIXELFORMAT_BGRA8888: { /* GF has wrong components order */ return GF_FORMAT_ARGB8888; } break; case SDL_PIXELFORMAT_YV12: { return GF_FORMAT_PLANAR_YUV_YV12; } break; case SDL_PIXELFORMAT_YUY2: { return GF_FORMAT_PACK_YUV_YUY2; } break; case SDL_PIXELFORMAT_UYVY: { return GF_FORMAT_PACK_YUV_UYVY; } break; case SDL_PIXELFORMAT_YVYU: { return GF_FORMAT_PACK_YUV_YVYU; } break; } return GF_FORMAT_INVALID; } uint32_t qnxgf_gf_to_sdl_pixelformat(gf_format_t pixelfmt) { switch (pixelfmt) { case GF_FORMAT_PAL8: { return SDL_PIXELFORMAT_INDEX8; } break; case GF_FORMAT_PKLE_ARGB1555: { return SDL_PIXELFORMAT_ARGB1555; } break; case GF_FORMAT_PACK_ARGB1555: { return SDL_PIXELFORMAT_ARGB1555; } break; case GF_FORMAT_PKBE_RGB565: { return SDL_PIXELFORMAT_BGR565; } break; case GF_FORMAT_PKLE_RGB565: { return SDL_PIXELFORMAT_RGB565; } break; case GF_FORMAT_PACK_RGB565: { return SDL_PIXELFORMAT_RGB565; } break; case GF_FORMAT_BGR888: { /* GF has wrong components order */ return SDL_PIXELFORMAT_RGB24; } break; case GF_FORMAT_BGRA8888: { /* GF has wrong components order */ return SDL_PIXELFORMAT_ARGB8888; } break; case GF_FORMAT_ARGB8888: { /* GF has wrong components order */ return SDL_PIXELFORMAT_BGRA8888; } break; case GF_FORMAT_PLANAR_YUV_YV12: { return SDL_PIXELFORMAT_YV12; } break; case GF_FORMAT_PACK_YUV_YUY2: { return SDL_PIXELFORMAT_YUY2; } break; case GF_FORMAT_PACK_YUV_UYVY: { return SDL_PIXELFORMAT_UYVY; } break; case GF_FORMAT_PACK_YUV_YVYU: { return SDL_PIXELFORMAT_YVYU; } break; } return SDL_PIXELFORMAT_UNKNOWN; } /* vi: set ts=4 sw=4 expandtab: */