Mercurial > sdl-ios-xcode
annotate src/video/SDL_surface.c @ 526:4314a501d7be
Fixed a crash blitting RLE surfaces to RLE surfaces
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Oct 2002 07:56:36 +0000 |
parents | c7da0cd5ae5e |
children | 058d47b7a3b4 |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
297
f6ffac90895c
Updated copyright information for 2002
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
3 Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga |
0 | 4 |
5 This library is free software; you can redistribute it and/or | |
6 modify it under the terms of the GNU Library General Public | |
7 License as published by the Free Software Foundation; either | |
8 version 2 of the License, or (at your option) any later version. | |
9 | |
10 This library is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 Library General Public License for more details. | |
14 | |
15 You should have received a copy of the GNU Library General Public | |
16 License along with this library; if not, write to the Free | |
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 | |
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 | 21 */ |
22 | |
23 #ifdef SAVE_RCSID | |
24 static char rcsid = | |
25 "@(#) $Id$"; | |
26 #endif | |
27 | |
28 #include <stdio.h> | |
29 #include <stdlib.h> | |
30 #include <string.h> | |
31 | |
32 #include "SDL_error.h" | |
33 #include "SDL_video.h" | |
34 #include "SDL_sysvideo.h" | |
35 #include "SDL_cursor_c.h" | |
36 #include "SDL_blit.h" | |
37 #include "SDL_RLEaccel_c.h" | |
38 #include "SDL_pixels_c.h" | |
39 #include "SDL_memops.h" | |
40 #include "SDL_leaks.h" | |
41 | |
42 /* Public routines */ | |
43 /* | |
44 * Create an empty RGB surface of the appropriate depth | |
45 */ | |
46 SDL_Surface * SDL_CreateRGBSurface (Uint32 flags, | |
47 int width, int height, int depth, | |
48 Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask) | |
49 { | |
50 SDL_VideoDevice *video = current_video; | |
51 SDL_VideoDevice *this = current_video; | |
52 SDL_Surface *screen; | |
53 SDL_Surface *surface; | |
54 | |
55 /* Check to see if we desire the surface in video memory */ | |
56 if ( video ) { | |
57 screen = SDL_PublicSurface; | |
58 } else { | |
59 screen = NULL; | |
60 } | |
61 if ( screen && ((screen->flags&SDL_HWSURFACE) == SDL_HWSURFACE) ) { | |
62 if ( (flags&(SDL_SRCCOLORKEY|SDL_SRCALPHA)) != 0 ) { | |
63 flags |= SDL_HWSURFACE; | |
64 } | |
65 if ( (flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { | |
66 if ( ! current_video->info.blit_hw_CC ) { | |
67 flags &= ~SDL_HWSURFACE; | |
68 } | |
69 } | |
70 if ( (flags & SDL_SRCALPHA) == SDL_SRCALPHA ) { | |
71 if ( ! current_video->info.blit_hw_A ) { | |
72 flags &= ~SDL_HWSURFACE; | |
73 } | |
74 } | |
75 } else { | |
76 flags &= ~SDL_HWSURFACE; | |
77 } | |
78 | |
79 /* Allocate the surface */ | |
80 surface = (SDL_Surface *)malloc(sizeof(*surface)); | |
81 if ( surface == NULL ) { | |
82 SDL_OutOfMemory(); | |
83 return(NULL); | |
84 } | |
85 surface->flags = SDL_SWSURFACE; | |
86 if ( (flags & SDL_HWSURFACE) == SDL_HWSURFACE ) { | |
87 depth = screen->format->BitsPerPixel; | |
88 Rmask = screen->format->Rmask; | |
89 Gmask = screen->format->Gmask; | |
90 Bmask = screen->format->Bmask; | |
91 Amask = screen->format->Amask; | |
92 } | |
93 surface->format = SDL_AllocFormat(depth, Rmask, Gmask, Bmask, Amask); | |
94 if ( surface->format == NULL ) { | |
95 free(surface); | |
96 return(NULL); | |
97 } | |
98 if ( Amask ) { | |
99 surface->flags |= SDL_SRCALPHA; | |
100 } | |
101 surface->w = width; | |
102 surface->h = height; | |
103 surface->pitch = SDL_CalculatePitch(surface); | |
104 surface->pixels = NULL; | |
105 surface->offset = 0; | |
106 surface->hwdata = NULL; | |
107 surface->locked = 0; | |
108 surface->map = NULL; | |
109 surface->format_version = 0; | |
441
598b25b9bffe
Zeroed out SDL_Surface::unused1 so glSDL will work on stock SDL
Sam Lantinga <slouken@libsdl.org>
parents:
431
diff
changeset
|
110 surface->unused1 = 0; |
0 | 111 SDL_SetClipRect(surface, NULL); |
112 | |
113 /* Get the pixels */ | |
114 if ( ((flags&SDL_HWSURFACE) == SDL_SWSURFACE) || | |
115 (video->AllocHWSurface(this, surface) < 0) ) { | |
116 if ( surface->w && surface->h ) { | |
117 surface->pixels = malloc(surface->h*surface->pitch); | |
118 if ( surface->pixels == NULL ) { | |
119 SDL_FreeSurface(surface); | |
120 SDL_OutOfMemory(); | |
121 return(NULL); | |
122 } | |
123 /* This is important for bitmaps */ | |
124 memset(surface->pixels, 0, surface->h*surface->pitch); | |
125 } | |
126 } | |
127 | |
128 /* Allocate an empty mapping */ | |
129 surface->map = SDL_AllocBlitMap(); | |
130 if ( surface->map == NULL ) { | |
131 SDL_FreeSurface(surface); | |
132 return(NULL); | |
133 } | |
134 | |
135 /* The surface is ready to go */ | |
136 surface->refcount = 1; | |
137 #ifdef CHECK_LEAKS | |
138 ++surfaces_allocated; | |
139 #endif | |
140 return(surface); | |
141 } | |
142 /* | |
143 * Create an RGB surface from an existing memory buffer | |
144 */ | |
145 SDL_Surface * SDL_CreateRGBSurfaceFrom (void *pixels, | |
146 int width, int height, int depth, int pitch, | |
147 Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask) | |
148 { | |
149 SDL_Surface *surface; | |
150 | |
151 surface = SDL_CreateRGBSurface(SDL_SWSURFACE, 0, 0, depth, | |
152 Rmask, Gmask, Bmask, Amask); | |
153 if ( surface != NULL ) { | |
154 surface->flags |= SDL_PREALLOC; | |
155 surface->pixels = pixels; | |
156 surface->w = width; | |
157 surface->h = height; | |
158 surface->pitch = pitch; | |
159 SDL_SetClipRect(surface, NULL); | |
160 } | |
161 return(surface); | |
162 } | |
163 /* | |
164 * Set the color key in a blittable surface | |
165 */ | |
166 int SDL_SetColorKey (SDL_Surface *surface, Uint32 flag, Uint32 key) | |
167 { | |
168 /* Sanity check the flag as it gets passed in */ | |
169 if ( flag & SDL_SRCCOLORKEY ) { | |
170 if ( flag & (SDL_RLEACCEL|SDL_RLEACCELOK) ) { | |
171 flag = (SDL_SRCCOLORKEY | SDL_RLEACCELOK); | |
172 } else { | |
173 flag = SDL_SRCCOLORKEY; | |
174 } | |
175 } else { | |
176 flag = 0; | |
177 } | |
178 | |
179 /* Optimize away operations that don't change anything */ | |
180 if ( (flag == (surface->flags & (SDL_SRCCOLORKEY|SDL_RLEACCELOK))) && | |
181 (key == surface->format->colorkey) ) { | |
182 return(0); | |
183 } | |
184 | |
185 /* UnRLE surfaces before we change the colorkey */ | |
186 if ( surface->flags & SDL_RLEACCEL ) { | |
187 SDL_UnRLESurface(surface, 1); | |
188 } | |
189 | |
190 if ( flag ) { | |
191 SDL_VideoDevice *video = current_video; | |
192 SDL_VideoDevice *this = current_video; | |
193 | |
194 | |
195 surface->flags |= SDL_SRCCOLORKEY; | |
196 surface->format->colorkey = key; | |
197 if ( (surface->flags & SDL_HWACCEL) == SDL_HWACCEL ) { | |
198 if ( (video->SetHWColorKey == NULL) || | |
199 (video->SetHWColorKey(this, surface, key) < 0) ) { | |
200 surface->flags &= ~SDL_HWACCEL; | |
201 } | |
202 } | |
203 if ( flag & SDL_RLEACCELOK ) { | |
204 surface->flags |= SDL_RLEACCELOK; | |
205 } else { | |
206 surface->flags &= ~SDL_RLEACCELOK; | |
207 } | |
208 } else { | |
209 surface->flags &= ~(SDL_SRCCOLORKEY|SDL_RLEACCELOK); | |
210 surface->format->colorkey = 0; | |
211 } | |
212 SDL_InvalidateMap(surface->map); | |
213 return(0); | |
214 } | |
431
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
215 /* This function sets the alpha channel of a surface */ |
0 | 216 int SDL_SetAlpha (SDL_Surface *surface, Uint32 flag, Uint8 value) |
217 { | |
218 Uint32 oldflags = surface->flags; | |
219 Uint32 oldalpha = surface->format->alpha; | |
220 | |
221 /* Sanity check the flag as it gets passed in */ | |
222 if ( flag & SDL_SRCALPHA ) { | |
223 if ( flag & (SDL_RLEACCEL|SDL_RLEACCELOK) ) { | |
224 flag = (SDL_SRCALPHA | SDL_RLEACCELOK); | |
225 } else { | |
226 flag = SDL_SRCALPHA; | |
227 } | |
228 } else { | |
229 flag = 0; | |
230 } | |
231 | |
232 /* Optimize away operations that don't change anything */ | |
233 if ( (flag == (surface->flags & (SDL_SRCALPHA|SDL_RLEACCELOK))) && | |
234 (!flag || value == oldalpha) ) { | |
235 return(0); | |
236 } | |
237 | |
238 if(!(flag & SDL_RLEACCELOK) && (surface->flags & SDL_RLEACCEL)) | |
239 SDL_UnRLESurface(surface, 1); | |
240 | |
241 if ( flag ) { | |
242 SDL_VideoDevice *video = current_video; | |
243 SDL_VideoDevice *this = current_video; | |
244 | |
245 surface->flags |= SDL_SRCALPHA; | |
246 surface->format->alpha = value; | |
247 if ( (surface->flags & SDL_HWACCEL) == SDL_HWACCEL ) { | |
248 if ( (video->SetHWAlpha == NULL) || | |
249 (video->SetHWAlpha(this, surface, value) < 0) ) { | |
250 surface->flags &= ~SDL_HWACCEL; | |
251 } | |
252 } | |
253 if ( flag & SDL_RLEACCELOK ) { | |
254 surface->flags |= SDL_RLEACCELOK; | |
255 } else { | |
256 surface->flags &= ~SDL_RLEACCELOK; | |
257 } | |
258 } else { | |
259 surface->flags &= ~SDL_SRCALPHA; | |
260 surface->format->alpha = SDL_ALPHA_OPAQUE; | |
261 } | |
262 /* | |
263 * The representation for software surfaces is independent of | |
264 * per-surface alpha, so no need to invalidate the blit mapping | |
265 * if just the alpha value was changed. (If either is 255, we still | |
266 * need to invalidate.) | |
267 */ | |
268 if((surface->flags & SDL_HWACCEL) == SDL_HWACCEL | |
269 || oldflags != surface->flags | |
270 || (((oldalpha + 1) ^ (value + 1)) & 0x100)) | |
271 SDL_InvalidateMap(surface->map); | |
272 return(0); | |
273 } | |
431
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
274 int SDL_SetAlphaChannel(SDL_Surface *surface, Uint8 value) |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
275 { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
276 int row, col; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
277 int offset; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
278 Uint8 *buf; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
279 |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
280 if ( (surface->format->Amask != 0xFF000000) && |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
281 (surface->format->Amask != 0x000000FF) ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
282 SDL_SetError("Unsupported surface alpha mask format"); |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
283 return -1; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
284 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
285 |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
286 #if SDL_BYTEORDER == SDL_LIL_ENDIAN |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
287 if ( surface->format->Amask == 0xFF000000 ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
288 offset = 3; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
289 } else { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
290 offset = 0; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
291 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
292 #else |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
293 if ( surface->format->Amask == 0xFF000000 ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
294 offset = 0; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
295 } else { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
296 offset = 3; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
297 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
298 #endif /* Byte ordering */ |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
299 |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
300 /* Quickly set the alpha channel of an RGBA or ARGB surface */ |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
301 if ( SDL_MUSTLOCK(surface) ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
302 if ( SDL_LockSurface(surface) < 0 ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
303 return -1; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
304 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
305 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
306 row = surface->h; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
307 while (row--) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
308 col = surface->w; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
309 buf = (Uint8 *)surface->pixels + row * surface->pitch + offset; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
310 while(col--) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
311 *buf = value; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
312 buf += 4; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
313 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
314 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
315 if ( SDL_MUSTLOCK(surface) ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
316 SDL_UnlockSurface(surface); |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
317 } |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
318 return 0; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
319 } |
0 | 320 |
321 /* | |
322 * A function to calculate the intersection of two rectangles: | |
323 * return true if the rectangles intersect, false otherwise | |
324 */ | |
325 static __inline__ | |
130
14af14ff7c19
The rectangle argument to SDL_SetClipRect is really const
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
326 SDL_bool SDL_IntersectRect(const SDL_Rect *A, const SDL_Rect *B, SDL_Rect *intersection) |
0 | 327 { |
328 int Amin, Amax, Bmin, Bmax; | |
329 | |
330 /* Horizontal intersection */ | |
331 Amin = A->x; | |
332 Amax = Amin + A->w; | |
333 Bmin = B->x; | |
334 Bmax = Bmin + B->w; | |
335 if(Bmin > Amin) | |
336 Amin = Bmin; | |
337 intersection->x = Amin; | |
338 if(Bmax < Amax) | |
339 Amax = Bmax; | |
340 intersection->w = Amax - Amin > 0 ? Amax - Amin : 0; | |
341 | |
342 /* Vertical intersection */ | |
343 Amin = A->y; | |
344 Amax = Amin + A->h; | |
345 Bmin = B->y; | |
346 Bmax = Bmin + B->h; | |
347 if(Bmin > Amin) | |
348 Amin = Bmin; | |
349 intersection->y = Amin; | |
350 if(Bmax < Amax) | |
351 Amax = Bmax; | |
352 intersection->h = Amax - Amin > 0 ? Amax - Amin : 0; | |
353 | |
354 return (intersection->w && intersection->h); | |
355 } | |
356 /* | |
357 * Set the clipping rectangle for a blittable surface | |
358 */ | |
130
14af14ff7c19
The rectangle argument to SDL_SetClipRect is really const
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
359 SDL_bool SDL_SetClipRect(SDL_Surface *surface, const SDL_Rect *rect) |
0 | 360 { |
361 SDL_Rect full_rect; | |
362 | |
363 /* Don't do anything if there's no surface to act on */ | |
364 if ( ! surface ) { | |
365 return SDL_FALSE; | |
366 } | |
367 | |
368 /* Set up the full surface rectangle */ | |
369 full_rect.x = 0; | |
370 full_rect.y = 0; | |
371 full_rect.w = surface->w; | |
372 full_rect.h = surface->h; | |
373 | |
374 /* Set the clipping rectangle */ | |
375 if ( ! rect ) { | |
376 surface->clip_rect = full_rect; | |
377 return 1; | |
378 } | |
379 return SDL_IntersectRect(rect, &full_rect, &surface->clip_rect); | |
380 } | |
381 void SDL_GetClipRect(SDL_Surface *surface, SDL_Rect *rect) | |
382 { | |
383 if ( surface && rect ) { | |
384 *rect = surface->clip_rect; | |
385 } | |
386 } | |
387 /* | |
388 * Set up a blit between two surfaces -- split into three parts: | |
389 * The upper part, SDL_UpperBlit(), performs clipping and rectangle | |
390 * verification. The lower part is a pointer to a low level | |
391 * accelerated blitting function. | |
392 * | |
393 * These parts are separated out and each used internally by this | |
394 * library in the optimimum places. They are exported so that if | |
395 * you know exactly what you are doing, you can optimize your code | |
396 * by calling the one(s) you need. | |
397 */ | |
398 int SDL_LowerBlit (SDL_Surface *src, SDL_Rect *srcrect, | |
399 SDL_Surface *dst, SDL_Rect *dstrect) | |
400 { | |
401 SDL_blit do_blit; | |
462
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
402 SDL_Rect hw_srcrect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
403 SDL_Rect hw_dstrect; |
0 | 404 |
405 /* Check to make sure the blit mapping is valid */ | |
406 if ( (src->map->dst != dst) || | |
407 (src->map->dst->format_version != src->map->format_version) ) { | |
408 if ( SDL_MapSurface(src, dst) < 0 ) { | |
409 return(-1); | |
410 } | |
411 } | |
412 | |
413 /* Figure out which blitter to use */ | |
414 if ( (src->flags & SDL_HWACCEL) == SDL_HWACCEL ) { | |
462
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
415 if ( src == SDL_VideoSurface ) { |
519
c7da0cd5ae5e
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
462
diff
changeset
|
416 hw_srcrect = *srcrect; |
462
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
417 hw_srcrect.x += current_video->offset_x; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
418 hw_srcrect.y += current_video->offset_y; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
419 srcrect = &hw_srcrect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
420 } |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
421 if ( dst == SDL_VideoSurface ) { |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
422 hw_dstrect = *dstrect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
423 hw_dstrect.x += current_video->offset_x; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
424 hw_dstrect.y += current_video->offset_y; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
425 dstrect = &hw_dstrect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
426 } |
0 | 427 do_blit = src->map->hw_blit; |
428 } else { | |
429 do_blit = src->map->sw_blit; | |
430 } | |
431 return(do_blit(src, srcrect, dst, dstrect)); | |
432 } | |
433 | |
434 | |
435 int SDL_UpperBlit (SDL_Surface *src, SDL_Rect *srcrect, | |
436 SDL_Surface *dst, SDL_Rect *dstrect) | |
437 { | |
438 SDL_Rect fulldst; | |
439 int srcx, srcy, w, h; | |
440 | |
441 /* Make sure the surfaces aren't locked */ | |
442 if ( ! src || ! dst ) { | |
443 SDL_SetError("SDL_UpperBlit: passed a NULL surface"); | |
444 return(-1); | |
445 } | |
446 if ( src->locked || dst->locked ) { | |
447 SDL_SetError("Surfaces must not be locked during blit"); | |
448 return(-1); | |
449 } | |
450 | |
451 /* If the destination rectangle is NULL, use the entire dest surface */ | |
452 if ( dstrect == NULL ) { | |
453 fulldst.x = fulldst.y = 0; | |
454 dstrect = &fulldst; | |
455 } | |
456 | |
457 /* clip the source rectangle to the source surface */ | |
458 if(srcrect) { | |
459 int maxw, maxh; | |
460 | |
461 srcx = srcrect->x; | |
462 w = srcrect->w; | |
463 if(srcx < 0) { | |
464 w += srcx; | |
465 dstrect->x -= srcx; | |
466 srcx = 0; | |
467 } | |
468 maxw = src->w - srcx; | |
469 if(maxw < w) | |
470 w = maxw; | |
471 | |
472 srcy = srcrect->y; | |
473 h = srcrect->h; | |
474 if(srcy < 0) { | |
475 h += srcy; | |
476 dstrect->y -= srcy; | |
477 srcy = 0; | |
478 } | |
479 maxh = src->h - srcy; | |
480 if(maxh < h) | |
481 h = maxh; | |
482 | |
483 } else { | |
484 srcx = srcy = 0; | |
485 w = src->w; | |
486 h = src->h; | |
487 } | |
488 | |
489 /* clip the destination rectangle against the clip rectangle */ | |
490 { | |
491 SDL_Rect *clip = &dst->clip_rect; | |
492 int dx, dy; | |
493 | |
494 dx = clip->x - dstrect->x; | |
495 if(dx > 0) { | |
496 w -= dx; | |
497 dstrect->x += dx; | |
498 srcx += dx; | |
499 } | |
500 dx = dstrect->x + w - clip->x - clip->w; | |
501 if(dx > 0) | |
502 w -= dx; | |
503 | |
504 dy = clip->y - dstrect->y; | |
505 if(dy > 0) { | |
506 h -= dy; | |
507 dstrect->y += dy; | |
508 srcy += dy; | |
509 } | |
510 dy = dstrect->y + h - clip->y - clip->h; | |
511 if(dy > 0) | |
512 h -= dy; | |
513 } | |
514 | |
515 if(w > 0 && h > 0) { | |
516 SDL_Rect sr; | |
517 sr.x = srcx; | |
518 sr.y = srcy; | |
519 sr.w = dstrect->w = w; | |
520 sr.h = dstrect->h = h; | |
521 return SDL_LowerBlit(src, &sr, dst, dstrect); | |
522 } | |
523 dstrect->w = dstrect->h = 0; | |
524 return 0; | |
525 } | |
526 | |
527 /* | |
528 * This function performs a fast fill of the given rectangle with 'color' | |
529 */ | |
530 int SDL_FillRect(SDL_Surface *dst, SDL_Rect *dstrect, Uint32 color) | |
531 { | |
532 SDL_VideoDevice *video = current_video; | |
533 SDL_VideoDevice *this = current_video; | |
534 int x, y; | |
535 Uint8 *row; | |
536 | |
537 /* If 'dstrect' == NULL, then fill the whole surface */ | |
538 if ( dstrect ) { | |
539 /* Perform clipping */ | |
540 if ( !SDL_IntersectRect(dstrect, &dst->clip_rect, dstrect) ) { | |
541 return(0); | |
542 } | |
543 } else { | |
544 dstrect = &dst->clip_rect; | |
545 } | |
546 | |
547 /* Check for hardware acceleration */ | |
548 if ( ((dst->flags & SDL_HWSURFACE) == SDL_HWSURFACE) && | |
549 video->info.blit_fill ) { | |
462
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
550 SDL_Rect hw_rect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
551 if ( dst == SDL_VideoSurface ) { |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
552 hw_rect = *dstrect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
553 hw_rect.x += current_video->offset_x; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
554 hw_rect.y += current_video->offset_y; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
555 dstrect = &hw_rect; |
1be0cdaf8092
Fixed offset bug in hardware accelerated fills and blits
Sam Lantinga <slouken@libsdl.org>
parents:
441
diff
changeset
|
556 } |
0 | 557 return(video->FillHWRect(this, dst, dstrect, color)); |
558 } | |
559 | |
560 /* Perform software fill */ | |
561 if ( SDL_LockSurface(dst) != 0 ) { | |
562 return(-1); | |
563 } | |
564 row = (Uint8 *)dst->pixels+dstrect->y*dst->pitch+ | |
565 dstrect->x*dst->format->BytesPerPixel; | |
566 if ( dst->format->palette || (color == 0) ) { | |
567 x = dstrect->w*dst->format->BytesPerPixel; | |
568 if ( !color && !((long)row&3) && !(x&3) && !(dst->pitch&3) ) { | |
569 int n = x >> 2; | |
570 for ( y=dstrect->h; y; --y ) { | |
571 SDL_memset4(row, 0, n); | |
572 row += dst->pitch; | |
573 } | |
574 } else { | |
575 #ifdef __powerpc__ | |
576 /* | |
577 * memset() on PPC (both glibc and codewarrior) uses | |
578 * the dcbz (Data Cache Block Zero) instruction, which | |
579 * causes an alignment exception if the destination is | |
580 * uncachable, so only use it on software surfaces | |
581 */ | |
582 if((dst->flags & SDL_HWSURFACE) == SDL_HWSURFACE) { | |
583 if(dstrect->w >= 8) { | |
584 /* | |
585 * 64-bit stores are probably most | |
586 * efficient to uncached video memory | |
587 */ | |
588 double fill; | |
589 memset(&fill, color, (sizeof fill)); | |
590 for(y = dstrect->h; y; y--) { | |
591 Uint8 *d = row; | |
592 unsigned n = x; | |
593 unsigned nn; | |
594 Uint8 c = color; | |
595 double f = fill; | |
596 while((unsigned long)d | |
597 & (sizeof(double) - 1)) { | |
598 *d++ = c; | |
599 n--; | |
600 } | |
601 nn = n / (sizeof(double) * 4); | |
602 while(nn) { | |
603 ((double *)d)[0] = f; | |
604 ((double *)d)[1] = f; | |
605 ((double *)d)[2] = f; | |
606 ((double *)d)[3] = f; | |
607 d += 4*sizeof(double); | |
608 nn--; | |
609 } | |
610 n &= ~(sizeof(double) * 4 - 1); | |
611 nn = n / sizeof(double); | |
612 while(nn) { | |
613 *(double *)d = f; | |
614 d += sizeof(double); | |
615 nn--; | |
616 } | |
617 n &= ~(sizeof(double) - 1); | |
618 while(n) { | |
619 *d++ = c; | |
620 n--; | |
621 } | |
622 row += dst->pitch; | |
623 } | |
624 } else { | |
625 /* narrow boxes */ | |
626 for(y = dstrect->h; y; y--) { | |
627 Uint8 *d = row; | |
628 Uint8 c = color; | |
629 int n = x; | |
630 while(n) { | |
631 *d++ = c; | |
632 n--; | |
633 } | |
634 row += dst->pitch; | |
635 } | |
636 } | |
637 } else | |
638 #endif /* __powerpc__ */ | |
639 { | |
640 for(y = dstrect->h; y; y--) { | |
641 memset(row, color, x); | |
642 row += dst->pitch; | |
643 } | |
644 } | |
645 } | |
646 } else { | |
647 switch (dst->format->BytesPerPixel) { | |
648 case 2: | |
649 for ( y=dstrect->h; y; --y ) { | |
650 Uint16 *pixels = (Uint16 *)row; | |
651 Uint16 c = color; | |
652 Uint32 cc = (Uint32)c << 16 | c; | |
653 int n = dstrect->w; | |
654 if((unsigned long)pixels & 3) { | |
655 *pixels++ = c; | |
656 n--; | |
657 } | |
658 if(n >> 1) | |
659 SDL_memset4(pixels, cc, n >> 1); | |
660 if(n & 1) | |
661 pixels[n - 1] = c; | |
662 row += dst->pitch; | |
663 } | |
664 break; | |
665 | |
666 case 3: | |
667 if(SDL_BYTEORDER == SDL_BIG_ENDIAN) | |
668 color <<= 8; | |
669 for ( y=dstrect->h; y; --y ) { | |
670 Uint8 *pixels = row; | |
671 for ( x=dstrect->w; x; --x ) { | |
672 memcpy(pixels, &color, 3); | |
673 pixels += 3; | |
674 } | |
675 row += dst->pitch; | |
676 } | |
677 break; | |
678 | |
679 case 4: | |
680 for(y = dstrect->h; y; --y) { | |
681 SDL_memset4(row, color, dstrect->w); | |
682 row += dst->pitch; | |
683 } | |
684 break; | |
685 } | |
686 } | |
687 SDL_UnlockSurface(dst); | |
688 | |
689 /* We're done! */ | |
690 return(0); | |
691 } | |
692 | |
693 /* | |
694 * Lock a surface to directly access the pixels | |
695 */ | |
696 int SDL_LockSurface (SDL_Surface *surface) | |
697 { | |
698 if ( ! surface->locked ) { | |
699 /* Perform the lock */ | |
700 if ( surface->flags & (SDL_HWSURFACE|SDL_ASYNCBLIT) ) { | |
701 SDL_VideoDevice *video = current_video; | |
702 SDL_VideoDevice *this = current_video; | |
703 if ( video->LockHWSurface(this, surface) < 0 ) { | |
704 return(-1); | |
705 } | |
706 } | |
707 if ( surface->flags & SDL_RLEACCEL ) { | |
708 SDL_UnRLESurface(surface, 1); | |
709 surface->flags |= SDL_RLEACCEL; /* save accel'd state */ | |
710 } | |
711 /* This needs to be done here in case pixels changes value */ | |
712 surface->pixels = (Uint8 *)surface->pixels + surface->offset; | |
713 } | |
714 | |
715 /* Increment the surface lock count, for recursive locks */ | |
716 ++surface->locked; | |
717 | |
718 /* Ready to go.. */ | |
719 return(0); | |
720 } | |
721 /* | |
722 * Unlock a previously locked surface | |
723 */ | |
724 void SDL_UnlockSurface (SDL_Surface *surface) | |
725 { | |
726 /* Only perform an unlock if we are locked */ | |
727 if ( ! surface->locked || (--surface->locked > 0) ) { | |
728 return; | |
729 } | |
730 | |
731 /* Perform the unlock */ | |
732 surface->pixels = (Uint8 *)surface->pixels - surface->offset; | |
733 | |
734 /* Unlock hardware or accelerated surfaces */ | |
735 if ( surface->flags & (SDL_HWSURFACE|SDL_ASYNCBLIT) ) { | |
736 SDL_VideoDevice *video = current_video; | |
737 SDL_VideoDevice *this = current_video; | |
738 video->UnlockHWSurface(this, surface); | |
739 } else { | |
740 /* Update RLE encoded surface with new data */ | |
741 if ( (surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL ) { | |
742 surface->flags &= ~SDL_RLEACCEL; /* stop lying */ | |
743 SDL_RLESurface(surface); | |
744 } | |
745 } | |
746 } | |
747 | |
748 /* | |
749 * Convert a surface into the specified pixel format. | |
750 */ | |
751 SDL_Surface * SDL_ConvertSurface (SDL_Surface *surface, | |
752 SDL_PixelFormat *format, Uint32 flags) | |
753 { | |
754 SDL_Surface *convert; | |
755 Uint32 colorkey = 0; | |
756 Uint8 alpha = 0; | |
757 Uint32 surface_flags; | |
758 SDL_Rect bounds; | |
759 | |
760 /* Check for empty destination palette! (results in empty image) */ | |
761 if ( format->palette != NULL ) { | |
762 int i; | |
763 for ( i=0; i<format->palette->ncolors; ++i ) { | |
764 if ( (format->palette->colors[i].r != 0) || | |
765 (format->palette->colors[i].g != 0) || | |
766 (format->palette->colors[i].b != 0) ) | |
767 break; | |
768 } | |
769 if ( i == format->palette->ncolors ) { | |
770 SDL_SetError("Empty destination palette"); | |
771 return(NULL); | |
772 } | |
773 } | |
774 | |
264
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
775 /* Only create hw surfaces with alpha channel if hw alpha blits |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
776 are supported */ |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
777 if(format->Amask != 0 && (flags & SDL_HWSURFACE)) { |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
778 const SDL_VideoInfo *vi = SDL_GetVideoInfo(); |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
779 if(!vi || !vi->blit_hw_A) |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
780 flags &= ~SDL_HWSURFACE; |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
781 } |
c9cd3b564e4b
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
782 |
0 | 783 /* Create a new surface with the desired format */ |
784 convert = SDL_CreateRGBSurface(flags, | |
785 surface->w, surface->h, format->BitsPerPixel, | |
786 format->Rmask, format->Gmask, format->Bmask, format->Amask); | |
787 if ( convert == NULL ) { | |
788 return(NULL); | |
789 } | |
790 | |
791 /* Copy the palette if any */ | |
792 if ( format->palette && convert->format->palette ) { | |
793 memcpy(convert->format->palette->colors, | |
794 format->palette->colors, | |
795 format->palette->ncolors*sizeof(SDL_Color)); | |
796 convert->format->palette->ncolors = format->palette->ncolors; | |
797 } | |
798 | |
799 /* Save the original surface color key and alpha */ | |
800 surface_flags = surface->flags; | |
801 if ( (surface_flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { | |
802 /* Convert colourkeyed surfaces to RGBA if requested */ | |
803 if((flags & SDL_SRCCOLORKEY) != SDL_SRCCOLORKEY | |
804 && format->Amask) { | |
805 surface_flags &= ~SDL_SRCCOLORKEY; | |
806 } else { | |
807 colorkey = surface->format->colorkey; | |
808 SDL_SetColorKey(surface, 0, 0); | |
809 } | |
810 } | |
811 if ( (surface_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) { | |
431
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
812 /* Copy over the alpha channel to RGBA if requested */ |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
813 if ( format->Amask ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
814 surface->flags &= ~SDL_SRCALPHA; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
815 } else { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
816 alpha = surface->format->alpha; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
817 SDL_SetAlpha(surface, 0, 0); |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
818 } |
0 | 819 } |
820 | |
821 /* Copy over the image data */ | |
822 bounds.x = 0; | |
823 bounds.y = 0; | |
824 bounds.w = surface->w; | |
825 bounds.h = surface->h; | |
826 SDL_LowerBlit(surface, &bounds, convert, &bounds); | |
827 | |
828 /* Clean up the original surface, and update converted surface */ | |
829 if ( convert != NULL ) { | |
830 SDL_SetClipRect(convert, &surface->clip_rect); | |
831 } | |
832 if ( (surface_flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { | |
833 Uint32 cflags = surface_flags&(SDL_SRCCOLORKEY|SDL_RLEACCELOK); | |
834 if ( convert != NULL ) { | |
835 Uint8 keyR, keyG, keyB; | |
836 | |
837 SDL_GetRGB(colorkey,surface->format,&keyR,&keyG,&keyB); | |
838 SDL_SetColorKey(convert, cflags|(flags&SDL_RLEACCELOK), | |
839 SDL_MapRGB(convert->format, keyR, keyG, keyB)); | |
840 } | |
841 SDL_SetColorKey(surface, cflags, colorkey); | |
842 } | |
843 if ( (surface_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) { | |
844 Uint32 aflags = surface_flags&(SDL_SRCALPHA|SDL_RLEACCELOK); | |
845 if ( convert != NULL ) { | |
846 SDL_SetAlpha(convert, aflags|(flags&SDL_RLEACCELOK), | |
847 alpha); | |
848 } | |
431
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
849 if ( format->Amask ) { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
850 surface->flags |= SDL_SRCALPHA; |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
851 } else { |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
852 SDL_SetAlpha(surface, aflags, alpha); |
41cadcba32e8
Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
Sam Lantinga <slouken@libsdl.org>
parents:
422
diff
changeset
|
853 } |
0 | 854 } |
855 | |
856 /* We're ready to go! */ | |
857 return(convert); | |
858 } | |
859 | |
860 /* | |
861 * Free a surface created by the above function. | |
862 */ | |
863 void SDL_FreeSurface (SDL_Surface *surface) | |
864 { | |
865 /* Free anything that's not NULL, and not the screen surface */ | |
866 if ((surface == NULL) || | |
867 (current_video && | |
868 ((surface == SDL_ShadowSurface)||(surface == SDL_VideoSurface)))) { | |
869 return; | |
870 } | |
871 if ( --surface->refcount > 0 ) { | |
872 return; | |
873 } | |
874 if ( (surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL ) { | |
875 SDL_UnRLESurface(surface, 0); | |
876 } | |
877 if ( surface->format ) { | |
878 SDL_FreeFormat(surface->format); | |
879 surface->format = NULL; | |
880 } | |
881 if ( surface->map != NULL ) { | |
882 SDL_FreeBlitMap(surface->map); | |
883 surface->map = NULL; | |
884 } | |
422
b1b9ee41be70
Memory leak fix for DirectX software surfaces
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
885 if ( surface->hwdata ) { |
0 | 886 SDL_VideoDevice *video = current_video; |
887 SDL_VideoDevice *this = current_video; | |
888 video->FreeHWSurface(this, surface); | |
889 } | |
890 if ( surface->pixels && | |
891 ((surface->flags & SDL_PREALLOC) != SDL_PREALLOC) ) { | |
892 free(surface->pixels); | |
893 } | |
894 free(surface); | |
895 #ifdef CHECK_LEAKS | |
896 --surfaces_allocated; | |
897 #endif | |
898 } |