Mercurial > sdl-ios-xcode

comparison src/video/fbcon/SDL_fbmatrox.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 a1b03ba2fcd0
comparison
equal deleted inserted replaced
1658:e49147870aac 1659:14717b52abc0
68 Uint32 fxbndry; 68 Uint32 fxbndry;
69 Uint32 ydstlen; 69 Uint32 ydstlen;
70 Uint32 fillop; 70 Uint32 fillop;
71 71
72 /* Don't blit to the display surface when switched away */ 72 /* Don't blit to the display surface when switched away */
73 if ( switched_away ) {
74 return -2; /* no hardware access */
75 }
73 if ( dst == this->screen ) { 76 if ( dst == this->screen ) {
74 SDL_mutexP(hw_lock); 77 SDL_mutexP(hw_lock);
75 } 78 }
76 79
77 switch (dst->format->BytesPerPixel) { 80 switch (dst->format->BytesPerPixel) {
130 if ( dst->pitch != SDL_VideoSurface->pitch ) { 133 if ( dst->pitch != SDL_VideoSurface->pitch ) {
131 return(src->map->sw_blit(src, srcrect, dst, dstrect)); 134 return(src->map->sw_blit(src, srcrect, dst, dstrect));
132 } 135 }
133 136
134 /* Don't blit to the display surface when switched away */ 137 /* Don't blit to the display surface when switched away */
138 if ( switched_away ) {
139 return -2; /* no hardware access */
140 }
135 if ( dst == this->screen ) { 141 if ( dst == this->screen ) {
136 SDL_mutexP(hw_lock); 142 SDL_mutexP(hw_lock);
137 } 143 }
138 144
139 /* Calculate source and destination base coordinates (in pixels) */ 145 /* Calculate source and destination base coordinates (in pixels) */