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

Fixed 64-bit compile issues

Browse source 
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402393
This commit is contained in:
Sam Lantinga 2007-06-30 03:47:50 +00:00
parent f6513ee758
commit b8cfbcff8f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/video/fbcon/SDL_fb3dfx.c
View file

@ -52,7 +52,7 @@ static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key)
static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
{
int bpp;
char *dst_base;
Uint32 dst_base;
Uint32 format;
int dstX, dstY;
@ -65,7 +65,7 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
}
/* Set the destination pixel format */
dst_base = (char *)((char *)dst->pixels - mapped_mem);
dst_base = ((char *)dst->pixels - mapped_mem);
bpp = dst->format->BitsPerPixel;
format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);
@ -75,7 +75,7 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
/* Execute the fill command */
tdfx_wait(6);
tdfx_out32(DSTBASE, (Uint32)dst_base);
tdfx_out32(DSTBASE, dst_base);
tdfx_out32(DSTFORMAT, format);
tdfx_out32(COLORFORE, color);
tdfx_out32(COMMAND_2D, COMMAND_2D_FILLRECT);
@ -97,8 +97,8 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
int bpp;
Uint32 src_format;
Uint32 dst_format;
char *src_base;
char *dst_base;
Uint32 src_base;
Uint32 dst_base;
int srcX, srcY;
int dstX, dstY;
Uint32 blitop;
@ -113,10 +113,10 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
}
/* Set the source and destination pixel format */
src_base = (char *)((char *)src->pixels - mapped_mem);
src_base = ((char *)src->pixels - mapped_mem);
bpp = src->format->BitsPerPixel;
src_format = src->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);
dst_base = (char *)((char *)dst->pixels - mapped_mem);
dst_base = ((char *)dst->pixels - mapped_mem);
bpp = dst->format->BitsPerPixel;
dst_format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13);