miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed symlinks to SDL 1.3 files that were changed, nad added the files themselves to SDL 1.2

Browse Source
This commit is contained in:
pelya
2010-07-29 16:59:15 +03:00
parent 90b098c2c3
commit 2e4e52a193
19 changed files with 8674 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
alienblaster/project/sdl/sdl-1.3/include/SDL_pixels.h
View File

@@ -29,14 +29,6 @@
#ifndef _SDL_pixels_h
#define _SDL_pixels_h
#include "SDL_version.h"
#if SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_video.h"
#else
#include "SDL_video-1.3.h"
#endif
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
@@ -227,7 +219,6 @@ enum
SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
SDL_PACKEDLAYOUT_2101010, 32, 4),
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_PIXELFORMAT_YV12 = /**< Planar mode: Y + V + U (3 planes) */
SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
SDL_PIXELFORMAT_IYUV = /**< Planar mode: Y + U + V (3 planes) */
@@ -238,10 +229,8 @@ enum
SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
SDL_PIXELFORMAT_YVYU = /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
#endif
};
#if SDL_VERSION_ATLEAST(1,3,0)
typedef struct SDL_Color
{
Uint8 r;
@@ -285,7 +274,6 @@ typedef struct SDL_PixelFormat
Uint32 Bmask;
Uint32 Amask;
} SDL_PixelFormat;
#endif
/**
* \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
@@ -332,7 +320,6 @@ extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
*
* \sa SDL_DelPaletteWatch()
*/
#if SDL_VERSION_ATLEAST(1,3,0)
extern DECLSPEC int SDLCALL SDL_AddPaletteWatch(SDL_Palette * palette,
SDL_PaletteChangedFunc
callback, void *userdata);
@@ -346,7 +333,7 @@ extern DECLSPEC int SDLCALL SDL_AddPaletteWatch(SDL_Palette * palette,
extern DECLSPEC void SDLCALL SDL_DelPaletteWatch(SDL_Palette * palette,
SDL_PaletteChangedFunc
callback, void *userdata);
#endif
/**
* \brief Set a range of colors in a palette.
*

7
alienblaster/project/sdl/sdl-1.3/include/SDL_rect.h
View File

@@ -31,11 +31,8 @@
#include "SDL_stdinc.h"
#include "SDL_error.h"
#include "SDL_pixels.h"
#include "SDL_rwops.h"
#include "SDL_version.h"
#if ! SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_video.h"
#endif
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -66,13 +63,11 @@ typedef struct
* \sa SDL_UnionRect
* \sa SDL_EnclosePoints
*/
#if SDL_VERSION_ATLEAST(1,3,0)
typedef struct SDL_Rect
{
int x, y;
int w, h;
} SDL_Rect;
#endif
/**
* \brief Returns true if the rectangle has no area.

22
alienblaster/project/sdl/sdl-1.3/include/SDL_video.h
View File

@@ -26,17 +26,13 @@
* Header file for SDL video functions.
*/
#ifndef _SDL_video_1_3_h
#define _SDL_video_1_3_h
#ifndef _SDL_video_h
#define _SDL_video_h
#include "SDL_stdinc.h"
#include "SDL_rect.h"
#include "SDL_pixels.h"
#include "SDL_rect.h"
#include "SDL_surface.h"
#include "SDL_version.h"
#if ! SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_video.h"
#endif
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -260,7 +256,6 @@ typedef struct SDL_Texture SDL_Texture;
*/
typedef void *SDL_GLContext;
#if SDL_VERSION_ATLEAST(1,3,0)
/**
* \brief OpenGL configuration attributes
*/
@@ -286,7 +281,7 @@ typedef enum
SDL_GL_CONTEXT_MAJOR_VERSION,
SDL_GL_CONTEXT_MINOR_VERSION
} SDL_GLattr;
#endif
/* Function prototypes */
@@ -323,13 +318,8 @@ extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index);
*
* \sa SDL_VideoQuit()
*/
extern DECLSPEC int SDLCALL
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_VideoInit
#else
SDL_VideoInit_1_3
#endif
(const char *driver_name, Uint32 flags);
extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name,
Uint32 flags);
/**
* \brief Shuts down the video subsystem.

21
alienblaster/project/sdl/sdl-1.3/src/video/SDL_pixels.c
View File

@@ -20,32 +20,22 @@
slouken@libsdl.org
*/
#include "SDL_config.h"
#include "SDL_version.h"
/* General (mostly internal) pixel/color manipulation routines for SDL */
#include "SDL_endian.h"
#if SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_video.h"
#include "SDL_sysvideo.h"
#else
#include "SDL_video-1.3.h"
#include "SDL_sysvideo-1.3.h"
#endif
#include "SDL_blit.h"
#include "SDL_pixels_c.h"
#if SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_RLEaccel_c.h"
#endif
#if SDL_VERSION_ATLEAST(1,3,0)
struct SDL_PaletteWatch
{
SDL_PaletteChangedFunc callback;
void *userdata;
struct SDL_PaletteWatch *next;
};
#endif
/* Helper functions */
@@ -298,7 +288,7 @@ SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
return SDL_PIXELFORMAT_UNKNOWN;
}
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_Palette *
SDL_AllocPalette(int ncolors)
{
@@ -438,8 +428,6 @@ SDL_AllocFormat(int bpp,
return SDL_InitFormat(format, bpp, Rmask, Gmask, Bmask, Amask);
}
#endif
SDL_PixelFormat *
SDL_InitFormat(SDL_PixelFormat * format, int bpp, Uint32 Rmask, Uint32 Gmask,
Uint32 Bmask, Uint32 Amask)
@@ -520,8 +508,6 @@ SDL_InitFormat(SDL_PixelFormat * format, int bpp, Uint32 Rmask, Uint32 Gmask,
return format;
}
#if SDL_VERSION_ATLEAST(1,3,0)
/*
* Change any previous mappings from/to the new surface format
*/
@@ -597,11 +583,7 @@ SDL_CalculatePitch(SDL_Surface * surface)
default:
break;
}
// 4-byte aligning adds extra memcpy() with OpenGL ES renderer
// TODO: check if we really can disable that for Android
#ifndef ANDROID
pitch = (pitch + 3) & ~3; /* 4-byte aligning */
#endif
return (pitch);
}
@@ -931,6 +913,5 @@ SDL_FreeBlitMap(SDL_BlitMap * map)
SDL_free(map);
}
}
#endif
/* vi: set ts=4 sw=4 expandtab: */

1
alienblaster/project/sdl/sdl-1.3/src/video/SDL_pixels_c.h
View File

@@ -20,7 +20,6 @@
slouken@libsdl.org
*/
#include "SDL_config.h"
#include "SDL_version.h"
/* Useful functions and variables from SDL_pixel.c */

1
alienblaster/project/sdl/sdl-1.3/src/video/SDL_rect_c.h
View File

@@ -20,7 +20,6 @@
slouken@libsdl.org
*/
#include "SDL_config.h"
#include "SDL_rect.h"
typedef struct SDL_DirtyRect
{

18
alienblaster/project/sdl/sdl-1.3/src/video/SDL_renderer_gles.c
View File

@@ -20,23 +20,15 @@
slouken@libsdl.org
*/
#include "SDL_config.h"
#include "SDL_version.h"
#if SDL_VIDEO_RENDER_OGL_ES
#if SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_video.h"
#include "SDL_sysvideo.h"
#else
#include "SDL_video-1.3.h"
#include "SDL_sysvideo-1.3.h"
#endif
#include "SDL_opengles.h"
#include "SDL_sysvideo.h"
#include "SDL_pixels_c.h"
#include "SDL_rect_c.h"
#if SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_yuv_sw_c.h"
#endif
#ifdef ANDROID
#include <android/log.h>
#endif
@@ -229,13 +221,11 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
GLint value;
int doublebuffer;
#if SDL_VERSION_ATLEAST(1,3,0)
if (!(window->flags & SDL_WINDOW_OPENGL)) {
if (SDL_RecreateWindow(window, window->flags | SDL_WINDOW_OPENGL) < 0) {
return NULL;
}
}
#endif
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
if (!renderer) {
@@ -313,15 +303,11 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
}
#ifdef ANDROID
// Always double-buffered
#else
if (SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &doublebuffer) == 0) {
if (!doublebuffer) {
renderer->info.flags |= SDL_RENDERER_SINGLEBUFFER;
}
}
#endif
#if SDL_VIDEO_DRIVER_PANDORA
data->GL_OES_draw_texture_supported = SDL_FALSE;
data->useDrawTexture = SDL_FALSE;
@@ -369,7 +355,6 @@ GLES_ActivateRenderer(SDL_Renderer * renderer)
data->glMatrixMode(GL_MODELVIEW);
data->glLoadIdentity();
#if SDL_VIDEO_RENDER_RESIZE
__android_log_print(ANDROID_LOG_INFO, "libSDL", "GLES_ActivateRenderer(): %dx%d", (int)window->display->desktop_mode.w, (int)window->display->desktop_mode.h);
data->glViewport(0, 0, window->display->desktop_mode.w, window->display->desktop_mode.h);
data->glOrthof(0.0, (GLfloat) window->display->desktop_mode.w, (GLfloat) window->display->desktop_mode.h,
0.0, 0.0, 1.0);
@@ -951,7 +936,6 @@ GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
if (data->GL_OES_draw_texture_supported && data->useDrawTexture) {
/* this code is a little funny because the viewport is upside down vs SDL's coordinate system */
SDL_Window *window = renderer->window;
GLint cropRect[4];
cropRect[0] = srcrect->x;
cropRect[1] = srcrect->y + srcrect->h;

5
alienblaster/project/sdl/sdl-1.3/src/video/SDL_sysvideo.h
View File

@@ -21,12 +21,11 @@
*/
#include "SDL_config.h"
#ifndef _SDL_sysvideo_1_3_h
#define _SDL_sysvideo_1_3_h
#ifndef _SDL_sysvideo_h
#define _SDL_sysvideo_h
#include "SDL_mouse.h"
#include "SDL_keysym.h"
#include "SDL_rect.h"
/* The SDL video driver */

82
alienblaster/project/sdl/sdl-1.3/src/video/SDL_video.c
View File

@@ -20,28 +20,19 @@
slouken@libsdl.org
*/
#include "SDL_config.h"
#include "SDL_version.h"
/* The high-level video driver subsystem */
#include "SDL.h"
#if SDL_VERSION_ATLEAST(1,3,0)
#include "SDL_video.h"
#include "SDL_sysvideo.h"
#else
#include "SDL_video-1.3.h"
#include "SDL_sysvideo-1.3.h"
#include "SDL_androidvideo.h"
#endif
#include "SDL_blit.h"
#include "SDL_pixels_c.h"
#include "SDL_renderer_gl.h"
#include "SDL_renderer_gles.h"
#include "SDL_renderer_sw.h"
#if SDL_VERSION_ATLEAST(1,3,0)
#include "../events/SDL_sysevents.h"
#include "../events/SDL_events_c.h"
#endif
#ifdef ANDROID
#include <android/log.h>
#endif
@@ -191,12 +182,8 @@ SDL_GetVideoDriver(int index)
/*
* Initialize the video and event subsystems -- determine native pixel format
*/
#if SDL_VERSION_ATLEAST(1,3,0)
int SDL_VideoInit
#else
int SDL_VideoInit_1_3
#endif
(const char *driver_name, Uint32 flags)
int
SDL_VideoInit(const char *driver_name, Uint32 flags)
{
SDL_VideoDevice *video;
int index;
@@ -207,7 +194,6 @@ int SDL_VideoInit_1_3
SDL_VideoQuit();
}
#if SDL_VERSION_ATLEAST(1,3,0)
/* Toggle the event thread flags, based on OS requirements */
#if defined(MUST_THREAD_EVENTS)
flags |= SDL_INIT_EVENTTHREAD;
@@ -222,11 +208,10 @@ int SDL_VideoInit_1_3
if (SDL_StartEventLoop(flags) < 0) {
return -1;
}
#endif
/* Select the proper video driver */
index = 0;
video = NULL;
#if SDL_VERSION_ATLEAST(1,3,0)
if (driver_name == NULL) {
driver_name = SDL_getenv("SDL_VIDEODRIVER");
}
@@ -255,14 +240,8 @@ int SDL_VideoInit_1_3
}
return -1;
}
_this = video;
_this->name = bootstrap[i]->name;
#else
video = ANDROID_CreateDevice_1_3(0);
_this = video;
_this->name = "android";
#endif
_this->next_object_id = 1;
@@ -311,11 +290,9 @@ int SDL_VideoInit_1_3
SDL_AddRenderDriver(display, &GL_ES_RenderDriver);
#endif
}
#if SDL_VERSION_ATLEAST(1,3,0)
if (display->num_render_drivers > 0) {
SDL_AddRenderDriver(display, &SW_RenderDriver);
}
#endif
}
/* We're ready to go! */
@@ -721,7 +698,6 @@ SDL_SetDisplayModeForDisplay(SDL_VideoDisplay * display, const SDL_DisplayMode *
}
display->current_mode = display_mode;
#if SDL_VERSION_ATLEAST(1,3,0)
/* Set up a palette, if necessary */
if (SDL_ISPIXELFORMAT_INDEXED(display_mode.format)) {
ncolors = (1 << SDL_BITSPERPIXEL(display_mode.format));
@@ -743,7 +719,6 @@ SDL_SetDisplayModeForDisplay(SDL_VideoDisplay * display, const SDL_DisplayMode *
SDL_BITSPERPIXEL(display_mode.format));
}
}
#endif
return 0;
}
@@ -789,8 +764,6 @@ SDL_GetWindowDisplayMode(SDL_Window * window, SDL_DisplayMode * mode)
return 0;
}
#if SDL_VERSION_ATLEAST(1,3,0)
static void
SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool attempt)
{
@@ -908,8 +881,6 @@ SDL_GetDisplayPalette(SDL_Color * colors, int firstcolor, int ncolors)
return SDL_GetPaletteForDisplay(SDL_CurrentDisplay, colors, firstcolor, ncolors);
}
#endif
SDL_Window *
SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
{
@@ -921,7 +892,6 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
SDL_VideoDisplay *display;
SDL_Window *window;
#if SDL_VERSION_ATLEAST(1,3,0)
if (!_this) {
/* Initialize the video system if needed */
if (SDL_VideoInit(NULL, 0) < 0) {
@@ -935,8 +905,6 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
}
SDL_GL_LoadLibrary(NULL);
}
#endif
display = SDL_CurrentDisplay;
window = (SDL_Window *)SDL_calloc(1, sizeof(*window));
window->magic = &_this->window_magic;
@@ -953,7 +921,6 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
}
display->windows = window;
#if SDL_VERSION_ATLEAST(1,3,0)
if (_this->CreateWindow && _this->CreateWindow(_this, window) < 0) {
SDL_DestroyWindow(window);
return NULL;
@@ -972,13 +939,10 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
SDL_ShowWindow(window);
}
SDL_UpdateWindowGrab(window);
#endif
return window;
}
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_Window *
SDL_CreateWindowFrom(const void *data)
{
@@ -1072,7 +1036,6 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
return 0;
}
#endif
static __inline__ SDL_Renderer *
SDL_GetCurrentRenderer(SDL_bool create)
@@ -1093,7 +1056,6 @@ SDL_GetCurrentRenderer(SDL_bool create)
return SDL_CurrentRenderer;
}
#if SDL_VERSION_ATLEAST(1,3,0)
Uint32
SDL_GetWindowID(SDL_Window * window)
{
@@ -1485,8 +1447,6 @@ SDL_GetFocusWindow(void)
return NULL;
}
#endif
void
SDL_DestroyWindow(SDL_Window * window)
{
@@ -1502,19 +1462,15 @@ SDL_DestroyWindow(SDL_Window * window)
SDL_DestroyRenderer(window);
}
#if SDL_VERSION_ATLEAST(1,3,0)
/* Restore video mode, etc. */
SDL_UpdateFullscreenMode(window, SDL_FALSE);
#endif
if (_this->DestroyWindow) {
_this->DestroyWindow(_this, window);
}
#if SDL_VERSION_ATLEAST(1,3,0)
if (window->flags & SDL_WINDOW_OPENGL) {
SDL_GL_UnloadLibrary();
}
#endif
/* Unlink the window from the list */
display = window->display;
@@ -1579,7 +1535,6 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
/* Free any existing renderer */
SDL_DestroyRenderer(window);
#if SDL_VERSION_ATLEAST(1,3,0)
if (index < 0) {
char *override = SDL_getenv("SDL_VIDEO_RENDERER");
int n = SDL_GetNumRenderDrivers();
@@ -1633,9 +1588,6 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
/* Create a new renderer instance */
window->renderer = SDL_CurrentDisplay->render_drivers[index].CreateRenderer(window, flags);
}
#else
window->renderer = GL_ES_RenderDriver.CreateRenderer(window, flags);
#endif
if (window->renderer == NULL) {
/* Assuming renderer set its error */
@@ -1754,13 +1706,8 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
}
} else {
if (surface->format->Amask
#if SDL_VERSION_ATLEAST(1,3,0)
|| !(surface->map->info.flags &
(SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) {
#else
|| !(surface->flags &
(SDL_SRCCOLORKEY | SDL_SRCALPHA))) {
#endif
Uint32 it;
int pfmt;
@@ -1985,7 +1932,6 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
/* Set up a destination surface for the texture update */
SDL_InitFormat(&dst_fmt, bpp, Rmask, Gmask, Bmask, Amask);
#if SDL_VERSION_ATLEAST(1,3,0)
if (SDL_ISPIXELFORMAT_INDEXED(format)) {
dst_fmt.palette =
SDL_AllocPalette((1 << SDL_BITSPERPIXEL(format)));
@@ -1998,17 +1944,14 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
SDL_BITSPERPIXEL(format));
}
}
#endif
dst = SDL_ConvertSurface(surface, &dst_fmt, 0);
if (dst) {
SDL_UpdateTexture(texture, NULL, dst->pixels, dst->pitch);
SDL_FreeSurface(dst);
}
#if SDL_VERSION_ATLEAST(1,3,0)
if (dst_fmt.palette) {
SDL_FreePalette(dst_fmt.palette);
}
#endif
if (!dst) {
SDL_DestroyTexture(texture);
return 0;
@@ -2020,7 +1963,6 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
int blendMode;
int scaleMode;
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_GetSurfaceColorMod(surface, &r, &g, &b);
SDL_SetTextureColorMod(texture, r, g, b);
@@ -2032,20 +1974,12 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
SDL_GetSurfaceScaleMode(surface, &scaleMode);
SDL_SetTextureScaleMode(texture, scaleMode);
#else
if(surface->flags & SDL_SRCALPHA) {
SDL_SetTextureAlphaMod(texture, surface->format->alpha);
SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
}
#endif
}
#if SDL_VERSION_ATLEAST(1,3,0)
if (SDL_ISPIXELFORMAT_INDEXED(format) && fmt->palette) {
SDL_SetTexturePalette(texture, fmt->palette->colors, 0,
fmt->palette->ncolors);
}
#endif
return texture;
}
@@ -3020,8 +2954,6 @@ SDL_DisableScreenSaver()
}
}
#if SDL_VERSION_ATLEAST(1,3,0)
void
SDL_VideoQuit(void)
{
@@ -3156,8 +3088,6 @@ SDL_GL_UnloadLibrary(void)
}
}
#endif
SDL_bool
SDL_GL_ExtensionSupported(const char *extension)
{
@@ -3212,8 +3142,6 @@ SDL_GL_ExtensionSupported(const char *extension)
#endif
}
#if SDL_VERSION_ATLEAST(1,3,0)
int
SDL_GL_SetAttribute(SDL_GLattr attr, int value)
{
@@ -3451,8 +3379,6 @@ SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
#endif /* SDL_VIDEO_OPENGL */
}
#endif /* SDL 1.3.0 */
SDL_GLContext
SDL_GL_CreateContext(SDL_Window * window)
{
@@ -3631,7 +3557,6 @@ SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask)
}
#endif
#if SDL_VERSION_ATLEAST(1,3,0)
SDL_bool
SDL_GetWindowWMInfo(SDL_Window * window, struct SDL_SysWMinfo *info)
{
@@ -3670,6 +3595,5 @@ SDL_SetTextInputRect(SDL_Rect *rect)
_this->SetTextInputRect(_this, rect);
}
}
#endif
/* vi: set ts=4 sw=4 expandtab: */