Mercurial > sdl-ios-xcode
view src/video/fbcon/SDL_fb3dfx.c @ 1199:2d6dc7de1145
From: Mike Frysinger <vapier@gentoo.org>
To: sdl@libsdl.org
Date: Sun, 11 Dec 2005 22:57:37 -0500
Subject: [SDL] exec stack in libsdl update
i posted back in September a patch to remove executable stacks:
http://www.devolution.com/pipermail/sdl/2005-September/070626.html
later in November, a similar patch was merged it seems:
http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/hermes/mmx_main.asm
however, this lacks the additional output format checks that i posted in my
patch ... this isnt a problem if the hermes asm code is only ever used to
produce ELF objects, but if this is not true, then the additional checks in
my original patch will need to be merged
-mike
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Mon, 12 Dec 2005 09:13:12 +0000 |
parents | b8d311d90021 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #include "SDL_types.h" #include "SDL_video.h" #include "SDL_blit.h" #include "SDL_fb3dfx.h" #include "3dfx_mmio.h" /* Wait for vertical retrace */ static void WaitVBL(_THIS) { /* find start of retrace */ tdfx_waitidle(); while( (tdfx_in32(TDFX_STATUS) & STATUS_RETRACE) == STATUS_RETRACE ) ; /* wait until we're past the start */ while( (tdfx_in32(TDFX_STATUS) & STATUS_RETRACE) == 0 ) ; } static void WaitIdle(_THIS) { tdfx_waitidle(); } /* Sets video mem colorkey and accelerated blit function */ static int SetHWColorKey(_THIS, SDL_Surface *surface, Uint32 key) { return(0); } static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) { int bpp; char *dst_base; Uint32 format; int dstX, dstY; /* Don't blit to the display surface when switched away */ if ( dst == this->screen ) { SDL_mutexP(hw_lock); } /* Set the destination pixel format */ dst_base = (char *)((char *)dst->pixels - mapped_mem); bpp = dst->format->BitsPerPixel; format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); /* Calculate source and destination base coordinates */ dstX = rect->x; dstY = rect->y; /* Execute the fill command */ tdfx_wait(6); tdfx_out32(DSTBASE, (Uint32)dst_base); tdfx_out32(DSTFORMAT, format); tdfx_out32(COLORFORE, color); tdfx_out32(COMMAND_2D, COMMAND_2D_FILLRECT); tdfx_out32(DSTSIZE, rect->w | (rect->h << 16)); tdfx_out32(LAUNCH_2D, dstX | (dstY << 16)); FB_AddBusySurface(dst); if ( dst == this->screen ) { SDL_mutexV(hw_lock); } return(0); } static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) { SDL_VideoDevice *this = current_video; int bpp; Uint32 src_format; Uint32 dst_format; char *src_base; char *dst_base; int srcX, srcY; int dstX, dstY; Uint32 blitop; Uint32 use_colorkey; /* Don't blit to the display surface when switched away */ if ( dst == this->screen ) { SDL_mutexP(hw_lock); } /* Set the source and destination pixel format */ src_base = (char *)((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); bpp = dst->format->BitsPerPixel; dst_format = dst->pitch | ((bpp+((bpp==8) ? 0 : 8)) << 13); srcX = srcrect->x; srcY = srcrect->y; dstX = dstrect->x; dstY = dstrect->y; /* Assemble the blit operation */ blitop = COMMAND_2D_BITBLT | (0xCC << 24); if ( srcX <= dstX ) { blitop |= BIT(14); srcX += (dstrect->w - 1); dstX += (dstrect->w - 1); } if ( srcY <= dstY ) { blitop |= BIT(15); srcY += (dstrect->h - 1); dstY += (dstrect->h - 1); } /* Perform the blit! */ if ( (src->flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { tdfx_wait(3); tdfx_out32(SRCCOLORKEYMIN, src->format->colorkey); tdfx_out32(SRCCOLORKEYMAX, src->format->colorkey); tdfx_out32(ROP_2D, 0xAA00); use_colorkey = 1; } else { use_colorkey = 0; } tdfx_wait(9); tdfx_out32(SRCBASE, (Uint32)src_base); tdfx_out32(SRCFORMAT, src_format); tdfx_out32(DSTBASE, (Uint32)dst_base); tdfx_out32(DSTFORMAT, src_format); tdfx_out32(COMMAND_2D, blitop); tdfx_out32(COMMANDEXTRA_2D, use_colorkey); tdfx_out32(DSTSIZE, dstrect->w | (dstrect->h << 16)); tdfx_out32(DSTXY, dstX | (dstY << 16)); tdfx_out32(LAUNCH_2D, srcX | (srcY << 16)); FB_AddBusySurface(src); FB_AddBusySurface(dst); if ( dst == this->screen ) { SDL_mutexV(hw_lock); } return(0); } static int CheckHWBlit(_THIS, SDL_Surface *src, SDL_Surface *dst) { int accelerated; /* Set initial acceleration on */ src->flags |= SDL_HWACCEL; /* Set the surface attributes */ if ( (src->flags & SDL_SRCALPHA) == SDL_SRCALPHA ) { if ( ! this->info.blit_hw_A ) { src->flags &= ~SDL_HWACCEL; } } if ( (src->flags & SDL_SRCCOLORKEY) == SDL_SRCCOLORKEY ) { if ( ! this->info.blit_hw_CC ) { src->flags &= ~SDL_HWACCEL; } } /* Check to see if final surface blit is accelerated */ accelerated = !!(src->flags & SDL_HWACCEL); if ( accelerated ) { src->map->hw_blit = HWAccelBlit; } return(accelerated); } void FB_3DfxAccel(_THIS, __u32 card) { /* We have hardware accelerated surface functions */ this->CheckHWBlit = CheckHWBlit; wait_vbl = WaitVBL; wait_idle = WaitIdle; /* Reset the 3Dfx controller */ tdfx_out32(BRESERROR0, 0); tdfx_out32(BRESERROR1, 0); /* The 3Dfx has an accelerated color fill */ this->info.blit_fill = 1; this->FillHWRect = FillHWRect; /* The 3Dfx has accelerated normal and colorkey blits */ this->info.blit_hw = 1; this->info.blit_hw_CC = 1; this->SetHWColorKey = SetHWColorKey; }