sdl-ios-xcode: src/video/SDL_surface.c annotate

annotate src/video/SDL_surface.c @ 2786:6bacfecbf27e

indent

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 25 Nov 2008 02:21:53 +0000
parents	fa1095d42a5b
children	93764fe8601a

rev	line source
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	3 Copyright (C) 1997-2006 Sam Lantinga
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	6 modify it under the terms of the GNU Lesser General Public
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	8 version 2.1 of the License, or (at your option) any later version.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	13 Lesser General Public License for more details.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	15 You should have received a copy of the GNU Lesser General Public
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	16 License along with this library; if not, write to the Free Software
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1251 diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	19 Sam Lantinga
252 e8157fcb3114 Updated the source with the correct e-mail address Sam Lantinga <slouken@libsdl.org> parents: 130 diff changeset	20 slouken@libsdl.org
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	22 #include "SDL_config.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	24 #include "SDL_video.h"
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	25 #include "SDL_compat.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 #include "SDL_sysvideo.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27 #include "SDL_blit.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	28 #include "SDL_RLEaccel_c.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	29 #include "SDL_pixels_c.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	30 #include "SDL_leaks.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	31
1251 86d0d01290ea Updated Windows CE/PocketPC support...adds GAPI driver, landscape mode, Ryan C. Gordon <icculus@icculus.org> parents: 1155 diff changeset	32
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	33 /* Public routines */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	34 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	35 * Create an empty RGB surface of the appropriate depth
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	36 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	37 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	38 SDL_CreateRGBSurface(Uint32 flags,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	39 int width, int height, int depth,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	40 Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	41 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	42 SDL_Surface *surface;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	43
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	44 /* Allocate the surface */
1920 8a162bfdc838 Convert SDL_malloc to SDL_calloc if appropriate, slightly faster on operating systems which map the zero page for memory allocations. Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	45 surface = (SDL_Surface ) SDL_calloc(1, sizeof(surface));
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	46 if (surface == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	47 SDL_OutOfMemory();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	48 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	49 }
940 bb1588ebe47b Date: Sat, 10 Jul 2004 21:02:33 +0200 Sam Lantinga <slouken@libsdl.org> parents: 915 diff changeset	50
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	51 surface->format = SDL_AllocFormat(depth, Rmask, Gmask, Bmask, Amask);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	52 if (!surface->format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	53 SDL_FreeSurface(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	54 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	55 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	56 surface->w = width;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	57 surface->h = height;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	58 surface->pitch = SDL_CalculatePitch(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	59 SDL_SetClipRect(surface, NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	60
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	61 if (surface->format->BitsPerPixel <= 8) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	62 SDL_Palette *palette =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	63 SDL_AllocPalette((1 << surface->format->BitsPerPixel));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	64 if (!palette) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	65 SDL_FreeSurface(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	66 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	67 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	68 if (Rmask \|\| Bmask \|\| Gmask) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	69 const SDL_PixelFormat *format = surface->format;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	70
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	71 /* create palette according to masks */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	72 int i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	73 int Rm = 0, Gm = 0, Bm = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	74 int Rw = 0, Gw = 0, Bw = 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	75
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	76 if (Rmask) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	77 Rw = 8 - format->Rloss;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	78 for (i = format->Rloss; i > 0; i -= Rw)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	79 Rm \|= 1 << i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	80 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	81 if (Gmask) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	82 Gw = 8 - format->Gloss;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	83 for (i = format->Gloss; i > 0; i -= Gw)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	84 Gm \|= 1 << i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	85 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	86 if (Bmask) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	87 Bw = 8 - format->Bloss;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	88 for (i = format->Bloss; i > 0; i -= Bw)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	89 Bm \|= 1 << i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	90 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	91 for (i = 0; i < palette->ncolors; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	92 int r, g, b;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	93 r = (i & Rmask) >> format->Rshift;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	94 r = (r << format->Rloss) \| ((r * Rm) >> Rw);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	95 palette->colors[i].r = r;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	96
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	97 g = (i & Gmask) >> format->Gshift;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	98 g = (g << format->Gloss) \| ((g * Gm) >> Gw);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	99 palette->colors[i].g = g;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	100
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	101 b = (i & Bmask) >> format->Bshift;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	102 b = (b << format->Bloss) \| ((b * Bm) >> Bw);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	103 palette->colors[i].b = b;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	104 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	105 } else if (palette->ncolors == 2) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	106 /* Create a black and white bitmap palette */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	107 palette->colors[0].r = 0xFF;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	108 palette->colors[0].g = 0xFF;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	109 palette->colors[0].b = 0xFF;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	110 palette->colors[1].r = 0x00;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	111 palette->colors[1].g = 0x00;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	112 palette->colors[1].b = 0x00;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	113 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	114 SDL_SetSurfacePalette(surface, palette);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	115 SDL_FreePalette(palette);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	116 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	117
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	118 /* Get the pixels */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	119 if (surface->w && surface->h) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	120 surface->pixels = SDL_malloc(surface->h * surface->pitch);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	121 if (!surface->pixels) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	122 SDL_FreeSurface(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	123 SDL_OutOfMemory();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	124 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	125 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	126 /* This is important for bitmaps */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	127 SDL_memset(surface->pixels, 0, surface->h * surface->pitch);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	128 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	129
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	130 /* Allocate an empty mapping */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	131 surface->map = SDL_AllocBlitMap();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	132 if (!surface->map) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	133 SDL_FreeSurface(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	134 return NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	135 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	136 SDL_FormatChanged(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	137
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	138 /* By default surface with an alpha mask are set up for blending */
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	139 if (Amask) {
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	140 SDL_SetSurfaceBlendMode(surface, SDL_TEXTUREBLENDMODE_BLEND);
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	141 }
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	142
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	143 /* The surface is ready to go */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	144 surface->refcount = 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	145 #ifdef CHECK_LEAKS
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	146 ++surfaces_allocated;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	147 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	148 return surface;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	149 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	150
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	151 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	152 * Create an RGB surface from an existing memory buffer
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	153 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	154 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	155 SDL_CreateRGBSurfaceFrom(void *pixels,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	156 int width, int height, int depth, int pitch,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	157 Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	158 Uint32 Amask)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	159 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	160 SDL_Surface *surface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	161
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	162 surface =
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	163 SDL_CreateRGBSurface(0, 0, 0, depth, Rmask, Gmask, Bmask, Amask);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	164 if (surface != NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	165 surface->flags \|= SDL_PREALLOC;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	166 surface->pixels = pixels;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	167 surface->w = width;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	168 surface->h = height;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	169 surface->pitch = pitch;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	170 SDL_SetClipRect(surface, NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	171 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	172 return surface;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	173 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	174
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	175 static int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	176 SDL_SurfacePaletteChanged(void userdata, SDL_Palette palette)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	177 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	178 SDL_Surface surface = (SDL_Surface ) userdata;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	179
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	180 SDL_FormatChanged(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	181
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	182 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	183 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	184
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	185 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	186 SDL_SetSurfacePalette(SDL_Surface * surface, SDL_Palette * palette)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	187 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	188 if (!surface \|\| !surface->format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	189 SDL_SetError("SDL_SetSurfacePalette() passed a NULL surface");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	190 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	191 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	192
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	193 if (palette && palette->ncolors != (1 << surface->format->BitsPerPixel)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	194 SDL_SetError
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	195 ("SDL_SetSurfacePalette() passed a palette that doesn't match the surface format");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	196 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	197 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	198
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	199 if (surface->format->palette == palette) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	200 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	201 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	202
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	203 if (surface->format->palette) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	204 SDL_DelPaletteWatch(surface->format->palette,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	205 SDL_SurfacePaletteChanged, surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	206 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	207
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	208 surface->format->palette = palette;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	209
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	210 if (surface->format->palette) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	211 SDL_AddPaletteWatch(surface->format->palette,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	212 SDL_SurfacePaletteChanged, surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	213 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	214 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	215 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	216
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	217 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	218 SDL_SetSurfaceRLE(SDL_Surface * surface, int flag)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	219 {
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	220 int flags;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	221
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	222 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	223 return -1;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	224 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	225
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	226 flags = surface->map->info.flags;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	227 if (flag) {
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	228 surface->map->info.flags \|= SDL_COPY_RLE_DESIRED;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	229 } else {
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	230 surface->map->info.flags &= ~SDL_COPY_RLE_DESIRED;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	231 }
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	232 if (surface->map->info.flags != flags) {
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	233 SDL_InvalidateMap(surface->map);
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	234 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	235 return 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	236 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	237
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	238 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	239 SDL_SetColorKey(SDL_Surface * surface, Uint32 flag, Uint32 key)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	240 {
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	241 int flags;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	242
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	243 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	244 return -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	245 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	246
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	247 if (flag & SDL_RLEACCEL) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	248 SDL_SetSurfaceRLE(surface, 1);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	249 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	250
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	251 flags = surface->map->info.flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	252 if (flag) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	253 surface->map->info.flags \|= SDL_COPY_COLORKEY;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	254 surface->map->info.colorkey = key;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	255 } else {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	256 surface->map->info.flags &= ~SDL_COPY_COLORKEY;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	257 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	258 if (surface->map->info.flags != flags) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	259 SDL_InvalidateMap(surface->map);
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	260 }
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	261
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	262 /* Compatibility mode */
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	263 if (surface->map->info.flags & SDL_COPY_COLORKEY) {
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	264 surface->flags \|= SDL_SRCCOLORKEY;
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	265 } else {
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	266 surface->flags &= ~SDL_SRCCOLORKEY;
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	267 }
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	268
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	269 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	270 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	271
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	272 /* This is a fairly slow function to switch from colorkey to alpha */
fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	273 void
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	274 SDL_ConvertColorkeyToAlpha(SDL_Surface * surface)
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	275 {
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	276 int x, y;
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	277
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	278 if (!surface) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	279 return;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	280 }
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	281
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	282 if (!(surface->map->info.flags & SDL_COPY_COLORKEY) \|\|
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	283 !surface->format->Amask) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	284 return;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	285 }
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	286
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	287 SDL_LockSurface(surface);
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	288
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	289 switch (surface->format->BytesPerPixel) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	290 case 2:
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	291 {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	292 Uint16 row, spot;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	293 Uint16 ckey = (Uint16) surface->map->info.colorkey;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	294 Uint16 mask = (Uint16) (~surface->format->Amask);
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	295
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	296 row = (Uint16 *) surface->pixels;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	297 for (y = surface->h; y--;) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	298 spot = row;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	299 for (x = surface->w; x--;) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	300 if (*spot == ckey) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	301 *spot &= mask;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	302 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	303 ++spot;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	304 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	305 row += surface->pitch / 2;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	306 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	307 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	308 break;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	309 case 3:
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	310 /* FIXME */
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	311 break;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	312 case 4:
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	313 {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	314 Uint32 row, spot;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	315 Uint32 ckey = surface->map->info.colorkey;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	316 Uint32 mask = ~surface->format->Amask;
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	317
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	318 row = (Uint32 *) surface->pixels;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	319 for (y = surface->h; y--;) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	320 spot = row;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	321 for (x = surface->w; x--;) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	322 if (*spot == ckey) {
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	323 *spot &= mask;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	324 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	325 ++spot;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	326 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	327 row += surface->pitch / 4;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	328 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	329 }
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	330 break;
6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	331 }
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	332
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	333 SDL_UnlockSurface(surface);
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	334
2786 6bacfecbf27e indent Sam Lantinga <slouken@libsdl.org> parents: 2785 diff changeset	335 SDL_SetColorKey(surface, 0, 0);
2785 fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	336 }
fa1095d42a5b Fixed bug with converting colorkey surface to texture Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	337
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	338 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	339 SDL_SetSurfaceColorMod(SDL_Surface * surface, Uint8 r, Uint8 g, Uint8 b)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	340 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	341 int flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	342
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	343 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	344 return -1;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	345 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	346
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	347 surface->map->info.r = r;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	348 surface->map->info.g = g;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	349 surface->map->info.b = b;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	350
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	351 flags = surface->map->info.flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	352 if (r != 0xFF \|\| g != 0xFF \|\| b != 0xFF) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	353 surface->map->info.flags \|= SDL_COPY_MODULATE_COLOR;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	354 } else {
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	355 surface->map->info.flags &= ~SDL_COPY_MODULATE_COLOR;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	356 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	357 if (surface->map->info.flags != flags) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	358 SDL_InvalidateMap(surface->map);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	359 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	360 return 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	361 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	362
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	363
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	364 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	365 SDL_GetSurfaceColorMod(SDL_Surface * surface, Uint8 * r, Uint8 * g, Uint8 * b)
431 41cadcba32e8 Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha Sam Lantinga <slouken@libsdl.org> parents: 422 diff changeset	366 {
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	367 if (!surface) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	368 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	369 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	370
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	371 if (r) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	372 *r = surface->map->info.r;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	373 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	374 if (g) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	375 *g = surface->map->info.g;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	376 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	377 if (b) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	378 *b = surface->map->info.b;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	379 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	380 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	381 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	382
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	383 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	384 SDL_SetSurfaceAlphaMod(SDL_Surface * surface, Uint8 alpha)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	385 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	386 int flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	387
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	388 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	389 return -1;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	390 }
431 41cadcba32e8 Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha Sam Lantinga <slouken@libsdl.org> parents: 422 diff changeset	391
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	392 surface->map->info.a = alpha;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	393
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	394 flags = surface->map->info.flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	395 if (alpha != 0xFF) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	396 surface->map->info.flags \|= SDL_COPY_MODULATE_ALPHA;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	397 } else {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	398 surface->map->info.flags &= ~SDL_COPY_MODULATE_ALPHA;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	399 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	400 if (surface->map->info.flags != flags) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	401 SDL_InvalidateMap(surface->map);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	402 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	403 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	404 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	405
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	406 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	407 SDL_GetSurfaceAlphaMod(SDL_Surface * surface, Uint8 * alpha)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	408 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	409 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	410 return -1;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	411 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	412
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	413 if (alpha) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	414 *alpha = surface->map->info.a;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	415 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	416 return 0;
431 41cadcba32e8 Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha Sam Lantinga <slouken@libsdl.org> parents: 422 diff changeset	417 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	418
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	419 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	420 SDL_SetSurfaceBlendMode(SDL_Surface * surface, int blendMode)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	421 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	422 int flags, status;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	423
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	424 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	425 return -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	426 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	427
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	428 status = 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	429 flags = surface->map->info.flags;
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	430 surface->map->info.flags &=
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	431 ~(SDL_COPY_MASK \| SDL_COPY_BLEND \| SDL_COPY_ADD \| SDL_COPY_MOD);
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	432 switch (blendMode) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	433 case SDL_TEXTUREBLENDMODE_NONE:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	434 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	435 case SDL_TEXTUREBLENDMODE_MASK:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	436 surface->map->info.flags \|= SDL_COPY_MASK;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	437 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	438 case SDL_TEXTUREBLENDMODE_BLEND:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	439 surface->map->info.flags \|= SDL_COPY_BLEND;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	440 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	441 case SDL_TEXTUREBLENDMODE_ADD:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	442 surface->map->info.flags \|= SDL_COPY_ADD;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	443 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	444 case SDL_TEXTUREBLENDMODE_MOD:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	445 surface->map->info.flags \|= SDL_COPY_MOD;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	446 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	447 default:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	448 SDL_Unsupported();
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	449 status = -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	450 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	451 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	452
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	453 if (surface->map->info.flags != flags) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	454 SDL_InvalidateMap(surface->map);
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	455 }
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	456
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	457 /* Compatibility mode */
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	458 if (surface->map->info.flags & SDL_COPY_BLEND) {
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	459 surface->flags \|= SDL_SRCALPHA;
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	460 } else {
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	461 surface->flags &= ~SDL_SRCALPHA;
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	462 }
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	463
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	464 return status;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	465 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	466
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	467 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	468 SDL_GetSurfaceBlendMode(SDL_Surface * surface, int *blendMode)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	469 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	470 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	471 return -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	472 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	473
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	474 if (!blendMode) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	475 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	476 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	477
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2329 diff changeset	478 switch (surface->map->
204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2329 diff changeset	479 info.flags & (SDL_COPY_MASK \| SDL_COPY_BLEND \| SDL_COPY_ADD \|
204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2329 diff changeset	480 SDL_COPY_MOD)) {
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	481 case SDL_COPY_MASK:
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	482 *blendMode = SDL_TEXTUREBLENDMODE_MASK;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	483 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	484 case SDL_COPY_BLEND:
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	485 *blendMode = SDL_TEXTUREBLENDMODE_BLEND;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	486 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	487 case SDL_COPY_ADD:
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	488 *blendMode = SDL_TEXTUREBLENDMODE_ADD;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	489 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	490 case SDL_COPY_MOD:
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	491 *blendMode = SDL_TEXTUREBLENDMODE_MOD;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	492 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	493 default:
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	494 *blendMode = SDL_TEXTUREBLENDMODE_NONE;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	495 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	496 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	497 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	498 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	499
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	500 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	501 SDL_SetSurfaceScaleMode(SDL_Surface * surface, int scaleMode)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	502 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	503 int flags, status;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	504
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	505 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	506 return -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	507 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	508
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	509 status = 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	510 flags = surface->map->info.flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	511 surface->map->info.flags &= ~(SDL_COPY_NEAREST);
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	512 switch (scaleMode) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	513 case SDL_TEXTURESCALEMODE_NONE:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	514 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	515 case SDL_TEXTURESCALEMODE_FAST:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	516 surface->map->info.flags \|= SDL_COPY_NEAREST;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	517 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	518 case SDL_TEXTURESCALEMODE_SLOW:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	519 case SDL_TEXTURESCALEMODE_BEST:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	520 SDL_Unsupported();
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	521 surface->map->info.flags \|= SDL_COPY_NEAREST;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	522 status = -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	523 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	524 default:
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	525 SDL_Unsupported();
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	526 status = -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	527 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	528 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	529
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	530 if (surface->map->info.flags != flags) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	531 SDL_InvalidateMap(surface->map);
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	532 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	533 return status;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	534 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	535
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	536 int
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	537 SDL_GetSurfaceScaleMode(SDL_Surface * surface, int *scaleMode)
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	538 {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	539 if (!surface) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	540 return -1;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	541 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	542
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	543 if (!scaleMode) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	544 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	545 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	546
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	547 switch (surface->map->info.flags & (SDL_COPY_NEAREST)) {
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	548 case SDL_COPY_NEAREST:
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	549 *scaleMode = SDL_TEXTURESCALEMODE_FAST;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	550 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	551 default:
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	552 *scaleMode = SDL_TEXTURESCALEMODE_NONE;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	553 break;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	554 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	555 return 0;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	556 }
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	557
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	558 SDL_bool
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	559 SDL_SetClipRect(SDL_Surface * surface, const SDL_Rect * rect)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	560 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	561 SDL_Rect full_rect;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	562
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	563 /* Don't do anything if there's no surface to act on */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	564 if (!surface) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	565 return SDL_FALSE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	566 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	567
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	568 /* Set up the full surface rectangle */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	569 full_rect.x = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	570 full_rect.y = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	571 full_rect.w = surface->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	572 full_rect.h = surface->h;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	573
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	574 /* Set the clipping rectangle */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	575 if (!rect) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	576 surface->clip_rect = full_rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	577 return 1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	578 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	579 return SDL_IntersectRect(rect, &full_rect, &surface->clip_rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	580 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	581
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	582 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	583 SDL_GetClipRect(SDL_Surface * surface, SDL_Rect * rect)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	584 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	585 if (surface && rect) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	586 *rect = surface->clip_rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	587 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	588 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	589
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	590 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	591 * Set up a blit between two surfaces -- split into three parts:
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	592 * The upper part, SDL_UpperBlit(), performs clipping and rectangle
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	593 * verification. The lower part is a pointer to a low level
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	594 * accelerated blitting function.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	595 *
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	596 * These parts are separated out and each used internally by this
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	597 * library in the optimimum places. They are exported so that if
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	598 * you know exactly what you are doing, you can optimize your code
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	599 * by calling the one(s) you need.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	600 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	601 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	602 SDL_LowerBlit(SDL_Surface * src, SDL_Rect * srcrect,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	603 SDL_Surface * dst, SDL_Rect * dstrect)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	604 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	605 /* Check to make sure the blit mapping is valid */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	606 if ((src->map->dst != dst) \|\|
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	607 (src->map->dst->format_version != src->map->format_version)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	608 if (SDL_MapSurface(src, dst) < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	609 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	610 }
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2267 diff changeset	611 /* just here for debugging */
2329 c1a390f6a819 ran make indent Bob Pendleton <bob@pendleton.com> parents: 2328 diff changeset	612 /* printf */
c1a390f6a819 ran make indent Bob Pendleton <bob@pendleton.com> parents: 2328 diff changeset	613 /* ("src = 0x%08X src->flags = %08X src->map->info.flags = %08x\ndst = 0x%08X dst->flags = %08X dst->map->info.flags = %08X\nsrc->map->blit = 0x%08x\n", */
c1a390f6a819 ran make indent Bob Pendleton <bob@pendleton.com> parents: 2328 diff changeset	614 /* src, dst->flags, src->map->info.flags, dst, dst->flags, */
c1a390f6a819 ran make indent Bob Pendleton <bob@pendleton.com> parents: 2328 diff changeset	615 /* dst->map->info.flags, src->map->blit); */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	616 }
2257 340942cfda48 Moved the colorkey and per-surface alpha into the blit info, Sam Lantinga <slouken@libsdl.org> parents: 2253 diff changeset	617 return (src->map->blit(src, srcrect, dst, dstrect));
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	618 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	619
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	620
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	621 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	622 SDL_UpperBlit(SDL_Surface * src, SDL_Rect * srcrect,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	623 SDL_Surface * dst, SDL_Rect * dstrect)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	624 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	625 SDL_Rect fulldst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	626 int srcx, srcy, w, h;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	627
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	628 /* Make sure the surfaces aren't locked */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	629 if (!src \|\| !dst) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	630 SDL_SetError("SDL_UpperBlit: passed a NULL surface");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	631 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	632 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	633 if (src->locked \|\| dst->locked) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	634 SDL_SetError("Surfaces must not be locked during blit");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	635 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	636 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	637
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	638 /* If the destination rectangle is NULL, use the entire dest surface */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	639 if (dstrect == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	640 fulldst.x = fulldst.y = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	641 dstrect = &fulldst;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	642 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	643
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	644 /* clip the source rectangle to the source surface */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	645 if (srcrect) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	646 int maxw, maxh;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	647
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	648 srcx = srcrect->x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	649 w = srcrect->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	650 if (srcx < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	651 w += srcx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	652 dstrect->x -= srcx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	653 srcx = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	654 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	655 maxw = src->w - srcx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	656 if (maxw < w)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	657 w = maxw;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	658
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	659 srcy = srcrect->y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	660 h = srcrect->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	661 if (srcy < 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	662 h += srcy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	663 dstrect->y -= srcy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	664 srcy = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	665 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	666 maxh = src->h - srcy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	667 if (maxh < h)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	668 h = maxh;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	669
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	670 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	671 srcx = srcy = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	672 w = src->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	673 h = src->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	674 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	675
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	676 /* clip the destination rectangle against the clip rectangle */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	677 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	678 SDL_Rect *clip = &dst->clip_rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	679 int dx, dy;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	680
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	681 dx = clip->x - dstrect->x;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	682 if (dx > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	683 w -= dx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	684 dstrect->x += dx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	685 srcx += dx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	686 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	687 dx = dstrect->x + w - clip->x - clip->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	688 if (dx > 0)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	689 w -= dx;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	690
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	691 dy = clip->y - dstrect->y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	692 if (dy > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	693 h -= dy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	694 dstrect->y += dy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	695 srcy += dy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	696 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	697 dy = dstrect->y + h - clip->y - clip->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	698 if (dy > 0)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	699 h -= dy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	700 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	701
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	702 if (w > 0 && h > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	703 SDL_Rect sr;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	704 sr.x = srcx;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	705 sr.y = srcy;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	706 sr.w = dstrect->w = w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	707 sr.h = dstrect->h = h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	708 return SDL_LowerBlit(src, &sr, dst, dstrect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	709 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	710 dstrect->w = dstrect->h = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	711 return 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	712 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	713
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	714 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	715 * Lock a surface to directly access the pixels
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	716 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	717 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	718 SDL_LockSurface(SDL_Surface * surface)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	719 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	720 if (!surface->locked) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	721 /* Perform the lock */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	722 if (surface->flags & SDL_RLEACCEL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	723 SDL_UnRLESurface(surface, 1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	724 surface->flags \|= SDL_RLEACCEL; /* save accel'd state */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	725 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	726 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	727
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	728 /* Increment the surface lock count, for recursive locks */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	729 ++surface->locked;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	730
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	731 /* Ready to go.. */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	732 return (0);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	733 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	734
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	735 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	736 * Unlock a previously locked surface
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	737 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	738 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	739 SDL_UnlockSurface(SDL_Surface * surface)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	740 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	741 /* Only perform an unlock if we are locked */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	742 if (!surface->locked \|\| (--surface->locked > 0)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	743 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	744 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	745
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	746 /* Update RLE encoded surface with new data */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	747 if ((surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	748 surface->flags &= ~SDL_RLEACCEL; /* stop lying */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	749 SDL_RLESurface(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	750 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	751 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	752
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	753 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	754 * Convert a surface into the specified pixel format.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	755 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	756 SDL_Surface *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	757 SDL_ConvertSurface(SDL_Surface * surface,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	758 SDL_PixelFormat * format, Uint32 flags)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	759 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	760 SDL_Surface *convert;
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	761 Uint32 copy_flags;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	762 SDL_Rect bounds;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	763
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	764 /* Check for empty destination palette! (results in empty image) */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	765 if (format->palette != NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	766 int i;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	767 for (i = 0; i < format->palette->ncolors; ++i) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	768 if ((format->palette->colors[i].r != 0xFF) \|\|
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	769 (format->palette->colors[i].g != 0xFF) \|\|
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	770 (format->palette->colors[i].b != 0xFF))
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	771 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	772 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	773 if (i == format->palette->ncolors) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	774 SDL_SetError("Empty destination palette");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	775 return (NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	776 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	777 }
264 c9cd3b564e4b * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	778
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	779 /* Create a new surface with the desired format */
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	780 convert = SDL_CreateRGBSurface(0, surface->w, surface->h,
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	781 format->BitsPerPixel, format->Rmask,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	782 format->Gmask, format->Bmask,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	783 format->Amask);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	784 if (convert == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	785 return (NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	786 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	787
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	788 /* Copy the palette if any */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	789 if (format->palette && convert->format->palette) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	790 SDL_memcpy(convert->format->palette->colors,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	791 format->palette->colors,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	792 format->palette->ncolors * sizeof(SDL_Color));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	793 convert->format->palette->ncolors = format->palette->ncolors;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	794 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	795
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	796 /* Save the original copy flags */
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	797 copy_flags = surface->map->info.flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	798 surface->map->info.flags = 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	799
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	800 /* Copy over the image data */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	801 bounds.x = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	802 bounds.y = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	803 bounds.w = surface->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	804 bounds.h = surface->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	805 SDL_LowerBlit(surface, &bounds, convert, &bounds);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	806
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	807 /* Clean up the original surface, and update converted surface */
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	808 SDL_SetClipRect(convert, &surface->clip_rect);
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	809 if (copy_flags & SDL_COPY_COLORKEY) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	810 Uint8 keyR, keyG, keyB, keyA;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	811
2267 c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	812 SDL_GetRGBA(surface->map->info.colorkey, surface->format, &keyR,
c785543d1843 Okay, still some bugs, but everything builds again... Sam Lantinga <slouken@libsdl.org> parents: 2266 diff changeset	813 &keyG, &keyB, &keyA);
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	814 SDL_SetColorKey(convert, 1,
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	815 SDL_MapRGBA(convert->format, keyR, keyG, keyB, keyA));
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	816 }
2266 e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	817 convert->map->info.r = surface->map->info.r;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	818 convert->map->info.g = surface->map->info.g;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	819 convert->map->info.b = surface->map->info.b;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	820 convert->map->info.a = surface->map->info.a;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	821 convert->map->info.flags = copy_flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	822 surface->map->info.flags = copy_flags;
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	823
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	824 /* Enable alpha blending by default if the new surface has an
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	825 * alpha channel or alpha modulation */
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	826 if (format->Amask \|\| (copy_flags & SDL_COPY_MODULATE_ALPHA)) {
e61ad15a205f More work in progress integrating SDL_Surface and the new SDL_Texture API Sam Lantinga <slouken@libsdl.org> parents: 2260 diff changeset	827 SDL_SetSurfaceBlendMode(convert, SDL_TEXTUREBLENDMODE_BLEND);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	828 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	829
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	830 /* We're ready to go! */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	831 return (convert);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	832 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	833
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	834 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	835 * Free a surface created by the above function.
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	836 */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	837 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	838 SDL_FreeSurface(SDL_Surface * surface)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	839 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	840 if (surface == NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	841 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	842 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	843 if (--surface->refcount > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	844 return;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	845 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	846 while (surface->locked > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	847 SDL_UnlockSurface(surface);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	848 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	849 if (surface->flags & SDL_RLEACCEL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	850 SDL_UnRLESurface(surface, 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	851 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	852 if (surface->format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	853 SDL_SetSurfacePalette(surface, NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	854 SDL_FreeFormat(surface->format);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	855 surface->format = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	856 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	857 if (surface->map != NULL) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	858 SDL_FreeBlitMap(surface->map);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	859 surface->map = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	860 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	861 if (surface->pixels && ((surface->flags & SDL_PREALLOC) != SDL_PREALLOC)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	862 SDL_free(surface->pixels);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	863 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	864 SDL_free(surface);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	865 #ifdef CHECK_LEAKS
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	866 --surfaces_allocated;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	867 #endif
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	868 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	869
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1456 diff changeset	870 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/SDL_surface.c @ 2786:6bacfecbf27e