pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some minor name changes to clean up

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40106
This commit is contained in:
Sam Lantinga 2001-07-13 10:15:52 +00:00
parent f4969ff561
commit 7ddaf6cf9a
2 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/video/dga/SDL_dgavideo.c
View file

@ -631,17 +631,17 @@ static void DGA_FreeHWSurfaces(_THIS)
surfaces.next = NULL; surfaces.next = NULL;
} }
static __inline__ void DGA_AddDirtySurface(SDL_Surface *surface) static __inline__ void DGA_AddBusySurface(SDL_Surface *surface)
{ {
((vidmem_bucket *)surface->hwdata)->dirty = 1; ((vidmem_bucket *)surface->hwdata)->dirty = 1;
} }
static __inline__ int DGA_IsSurfaceDirty(SDL_Surface *surface) static __inline__ int DGA_IsSurfaceBusy(SDL_Surface *surface)
{ {
return ((vidmem_bucket *)surface->hwdata)->dirty; return ((vidmem_bucket *)surface->hwdata)->dirty;
} }
static __inline__ void DGA_WaitDirtySurfaces(_THIS) static __inline__ void DGA_WaitBusySurfaces(_THIS)
{ {
vidmem_bucket *bucket; vidmem_bucket *bucket;
@ -783,7 +783,7 @@ static void DGA_FreeHWSurface(_THIS, SDL_Surface *surface)
surface->hwdata = NULL; surface->hwdata = NULL;
} }
static __inline__ void dst_to_xy(_THIS, SDL_Surface *dst, int *x, int *y) static __inline__ void DGA_dst_to_xy(_THIS, SDL_Surface *dst, int *x, int *y)
{ {
*x = (long)((Uint8 *)dst->pixels - memory_base)%memory_pitch; *x = (long)((Uint8 *)dst->pixels - memory_base)%memory_pitch;
*y = (long)((Uint8 *)dst->pixels - memory_base)/memory_pitch; *y = (long)((Uint8 *)dst->pixels - memory_base)/memory_pitch;
@ -805,7 +805,7 @@ static int DGA_FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
/* Keep waiting for the hardware ... */ ; /* Keep waiting for the hardware ... */ ;
was_flipped = 0; was_flipped = 0;
} }
dst_to_xy(this, dst, &x, &y); DGA_dst_to_xy(this, dst, &x, &y);
x += rect->x; x += rect->x;
y += rect->y; y += rect->y;
w = rect->w; w = rect->w;
@ -815,7 +815,7 @@ static int DGA_FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
#endif #endif
XDGAFillRectangle(DGA_Display, DGA_Screen, x, y, w, h, color); XDGAFillRectangle(DGA_Display, DGA_Screen, x, y, w, h, color);
XFlush(DGA_Display); XFlush(DGA_Display);
DGA_AddDirtySurface(dst); DGA_AddBusySurface(dst);
UNLOCK_DISPLAY(); UNLOCK_DISPLAY();
return(0); return(0);
} }
@ -836,10 +836,10 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
/* Keep waiting for the hardware ... */ ; /* Keep waiting for the hardware ... */ ;
was_flipped = 0; was_flipped = 0;
} }
dst_to_xy(this, src, &srcx, &srcy); DGA_dst_to_xy(this, src, &srcx, &srcy);
srcx += srcrect->x; srcx += srcrect->x;
srcy += srcrect->y; srcy += srcrect->y;
dst_to_xy(this, dst, &dstx, &dsty); DGA_dst_to_xy(this, dst, &dstx, &dsty);
dstx += dstrect->x; dstx += dstrect->x;
dsty += dstrect->y; dsty += dstrect->y;
w = srcrect->w; w = srcrect->w;
@ -855,8 +855,8 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
srcx, srcy, w, h, dstx, dsty); srcx, srcy, w, h, dstx, dsty);
} }
XFlush(DGA_Display); XFlush(DGA_Display);
DGA_AddDirtySurface(src); DGA_AddBusySurface(src);
DGA_AddDirtySurface(dst); DGA_AddBusySurface(dst);
UNLOCK_DISPLAY(); UNLOCK_DISPLAY();
return(0); return(0);
} }
@ -902,15 +902,15 @@ static int DGA_LockHWSurface(_THIS, SDL_Surface *surface)
if ( surface == this->screen ) { if ( surface == this->screen ) {
SDL_mutexP(hw_lock); SDL_mutexP(hw_lock);
LOCK_DISPLAY(); LOCK_DISPLAY();
if ( DGA_IsSurfaceDirty(surface) ) { if ( DGA_IsSurfaceBusy(surface) ) {
DGA_WaitDirtySurfaces(this); DGA_WaitBusySurfaces(this);
} }
DGA_WaitFlip(this); DGA_WaitFlip(this);
UNLOCK_DISPLAY(); UNLOCK_DISPLAY();
} else { } else {
if ( DGA_IsSurfaceDirty(surface) ) { if ( DGA_IsSurfaceBusy(surface) ) {
LOCK_DISPLAY(); LOCK_DISPLAY();
DGA_WaitDirtySurfaces(this); DGA_WaitBusySurfaces(this);
UNLOCK_DISPLAY(); UNLOCK_DISPLAY();
} }
} }
@ -927,8 +927,8 @@ static int DGA_FlipHWSurface(_THIS, SDL_Surface *surface)
{ {
/* Wait for vertical retrace and then flip display */ /* Wait for vertical retrace and then flip display */
LOCK_DISPLAY(); LOCK_DISPLAY();
if ( DGA_IsSurfaceDirty(this->screen) ) { if ( DGA_IsSurfaceBusy(this->screen) ) {
DGA_WaitDirtySurfaces(this); DGA_WaitBusySurfaces(this);
} }
DGA_WaitFlip(this); DGA_WaitFlip(this);
XDGASetViewport(DGA_Display, DGA_Screen, XDGASetViewport(DGA_Display, DGA_Screen,

6
src/video/dga/SDL_dgavideo.h
View file

@ -58,12 +58,6 @@ typedef struct vidmem_bucket {
struct vidmem_bucket *next; struct vidmem_bucket *next;
} vidmem_bucket; } vidmem_bucket;
/* Information about the location of the surface in hardware memory */
struct private_hwdata {
int x;
int y;
};
/* Private display data */ /* Private display data */
struct SDL_PrivateVideoData { struct SDL_PrivateVideoData {
Display *DGA_Display; Display *DGA_Display;