Mercurial > sdl-ios-xcode

comparison src/video/fbcon/SDL_fb3dfx.c @ 1659:14717b52abc0 SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents d910939febfa
children 782fd950bd46 c121d94672cb f903dc168217
comparison
equal deleted inserted replaced
1658:e49147870aac 1659:14717b52abc0
55 char *dst_base; 55 char *dst_base;
56 Uint32 format; 56 Uint32 format;
57 int dstX, dstY; 57 int dstX, dstY;
58 58
59 /* Don't blit to the display surface when switched away */ 59 /* Don't blit to the display surface when switched away */
60 if ( switched_away ) {
61 return -2; /* no hardware access */
62 }
60 if ( dst == this->screen ) { 63 if ( dst == this->screen ) {
61 SDL_mutexP(hw_lock); 64 SDL_mutexP(hw_lock);
62 } 65 }
63 66
64 /* Set the destination pixel format */ 67 /* Set the destination pixel format */
100 int dstX, dstY; 103 int dstX, dstY;
101 Uint32 blitop; 104 Uint32 blitop;
102 Uint32 use_colorkey; 105 Uint32 use_colorkey;
103 106
104 /* Don't blit to the display surface when switched away */ 107 /* Don't blit to the display surface when switched away */
108 if ( switched_away ) {
109 return -2; /* no hardware access */
110 }
105 if ( dst == this->screen ) { 111 if ( dst == this->screen ) {
106 SDL_mutexP(hw_lock); 112 SDL_mutexP(hw_lock);
107 } 113 }
108 114
109 /* Set the source and destination pixel format */ 115 /* Set the source and destination pixel format */