diff src/video/fbcon/SDL_fb3dfx.c @ 1668:4da1ee79c9af SDL-1.3

more tweaking indent options
author Sam Lantinga <slouken@libsdl.org>
date Mon, 29 May 2006 04:04:35 +0000
parents 782fd950bd46
children
line wrap: on
line diff
--- a/src/video/fbcon/SDL_fb3dfx.c	Mon May 29 03:53:21 2006 +0000
+++ b/src/video/fbcon/SDL_fb3dfx.c	Mon May 29 04:04:35 2006 +0000
@@ -29,29 +29,29 @@
 
 /* Wait for vertical retrace */
 static void
-WaitVBL (_THIS)
+WaitVBL(_THIS)
 {
     /* find start of retrace */
-    tdfx_waitidle ();
-    while ((tdfx_in32 (TDFX_STATUS) & STATUS_RETRACE) == STATUS_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);
+    while ((tdfx_in32(TDFX_STATUS) & STATUS_RETRACE) == 0);
 }
 static void
-WaitIdle (_THIS)
+WaitIdle(_THIS)
 {
-    tdfx_waitidle ();
+    tdfx_waitidle();
 }
 
 /* Sets video mem colorkey and accelerated blit function */
 static int
-SetHWColorKey (_THIS, SDL_Surface * surface, Uint32 key)
+SetHWColorKey(_THIS, SDL_Surface * surface, Uint32 key)
 {
     return (0);
 }
 
 static int
-FillHWRect (_THIS, SDL_Surface * dst, SDL_Rect * rect, Uint32 color)
+FillHWRect(_THIS, SDL_Surface * dst, SDL_Rect * rect, Uint32 color)
 {
     int bpp;
     char *dst_base;
@@ -63,7 +63,7 @@
         return -2;              /* no hardware access */
     }
     if (dst == this->screen) {
-        SDL_mutexP (hw_lock);
+        SDL_mutexP(hw_lock);
     }
 
     /* Set the destination pixel format */
@@ -76,25 +76,25 @@
     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));
+    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);
+    FB_AddBusySurface(dst);
 
     if (dst == this->screen) {
-        SDL_mutexV (hw_lock);
+        SDL_mutexV(hw_lock);
     }
     return (0);
 }
 
 static int
-HWAccelBlit (SDL_Surface * src, SDL_Rect * srcrect,
-             SDL_Surface * dst, SDL_Rect * dstrect)
+HWAccelBlit(SDL_Surface * src, SDL_Rect * srcrect,
+            SDL_Surface * dst, SDL_Rect * dstrect)
 {
     SDL_VideoDevice *this = current_video;
     int bpp;
@@ -112,7 +112,7 @@
         return -2;              /* no hardware access */
     }
     if (dst == this->screen) {
-        SDL_mutexP (hw_lock);
+        SDL_mutexP(hw_lock);
     }
 
     /* Set the source and destination pixel format */
@@ -131,48 +131,48 @@
     /* Assemble the blit operation */
     blitop = COMMAND_2D_BITBLT | (0xCC << 24);
     if (srcX <= dstX) {
-        blitop |= BIT (14);
+        blitop |= BIT(14);
         srcX += (dstrect->w - 1);
         dstX += (dstrect->w - 1);
     }
     if (srcY <= dstY) {
-        blitop |= BIT (15);
+        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);
+        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));
+    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);
+    FB_AddBusySurface(src);
+    FB_AddBusySurface(dst);
 
     if (dst == this->screen) {
-        SDL_mutexV (hw_lock);
+        SDL_mutexV(hw_lock);
     }
     return (0);
 }
 
 static int
-CheckHWBlit (_THIS, SDL_Surface * src, SDL_Surface * dst)
+CheckHWBlit(_THIS, SDL_Surface * src, SDL_Surface * dst)
 {
     int accelerated;
 
@@ -200,7 +200,7 @@
 }
 
 void
-FB_3DfxAccel (_THIS, __u32 card)
+FB_3DfxAccel(_THIS, __u32 card)
 {
     /* We have hardware accelerated surface functions */
     this->CheckHWBlit = CheckHWBlit;
@@ -208,8 +208,8 @@
     wait_idle = WaitIdle;
 
     /* Reset the 3Dfx controller */
-    tdfx_out32 (BRESERROR0, 0);
-    tdfx_out32 (BRESERROR1, 0);
+    tdfx_out32(BRESERROR0, 0);
+    tdfx_out32(BRESERROR1, 0);
 
     /* The 3Dfx has an accelerated color fill */
     this->info.blit_fill = 1;