Mercurial > sdl-ios-xcode

comparison src/video/fbcon/SDL_fbriva.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
75 int dstX, dstY; 75 int dstX, dstY;
76 int dstW, dstH; 76 int dstW, dstH;
77 RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); 77 RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET);
78 78
79 /* Don't blit to the display surface when switched away */ 79 /* Don't blit to the display surface when switched away */
80 if ( switched_away ) {
81 return -2; /* no hardware access */
82 }
80 if ( dst == this->screen ) { 83 if ( dst == this->screen ) {
81 SDL_mutexP(hw_lock); 84 SDL_mutexP(hw_lock);
82 } 85 }
83 86
84 /* Set up the X/Y base coordinates */ 87 /* Set up the X/Y base coordinates */
118 if ( dst->pitch != SDL_VideoSurface->pitch ) { 121 if ( dst->pitch != SDL_VideoSurface->pitch ) {
119 return(src->map->sw_blit(src, srcrect, dst, dstrect)); 122 return(src->map->sw_blit(src, srcrect, dst, dstrect));
120 } 123 }
121 124
122 /* Don't blit to the display surface when switched away */ 125 /* Don't blit to the display surface when switched away */
126 if ( switched_away ) {
127 return -2; /* no hardware access */
128 }
123 if ( dst == this->screen ) { 129 if ( dst == this->screen ) {
124 SDL_mutexP(hw_lock); 130 SDL_mutexP(hw_lock);
125 } 131 }
126 132
127 /* Calculate source and destination base coordinates (in pixels) */ 133 /* Calculate source and destination base coordinates (in pixels) */