131 lines
3.6 KiB
Diff
131 lines
3.6 KiB
Diff
diff --git a/src/video/fbcon/SDL_fbriva.c b/src/video/fbcon/SDL_fbriva.c
|
|
index eb4b71f1b..59469759c 100644
|
|
--- a/src/video/fbcon/SDL_fbriva.c
|
|
+++ b/src/video/fbcon/SDL_fbriva.c
|
|
@@ -24,12 +24,10 @@
|
|
#include "SDL_video.h"
|
|
#include "../SDL_blit.h"
|
|
#include "SDL_fbriva.h"
|
|
-#include "riva_mmio.h"
|
|
#include "riva_regs.h"
|
|
|
|
|
|
static int FifoEmptyCount = 0;
|
|
-static int FifoFreeCount = 0;
|
|
|
|
/* Wait for vertical retrace */
|
|
static void WaitVBL(_THIS)
|
|
@@ -41,20 +39,6 @@ static void WaitVBL(_THIS)
|
|
while ( !(*port & 0x08) )
|
|
;
|
|
}
|
|
-static void NV3WaitIdle(_THIS)
|
|
-{
|
|
- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
|
|
- while ( (Rop->FifoFree < FifoEmptyCount) ||
|
|
- (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) )
|
|
- ;
|
|
-}
|
|
-static void NV4WaitIdle(_THIS)
|
|
-{
|
|
- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
|
|
- while ( (Rop->FifoFree < FifoEmptyCount) ||
|
|
- (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) )
|
|
- ;
|
|
-}
|
|
|
|
#if 0 /* Not yet implemented? */
|
|
/* Sets video mem colorkey and accelerated blit function */
|
|
@@ -74,7 +58,6 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
|
|
{
|
|
int dstX, dstY;
|
|
int dstW, dstH;
|
|
- RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET);
|
|
|
|
/* Don't blit to the display surface when switched away */
|
|
if ( switched_away ) {
|
|
@@ -93,13 +76,6 @@ static int FillHWRect(_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color)
|
|
dstX += rect->x;
|
|
dstY += rect->y;
|
|
|
|
- RIVA_FIFO_FREE(Bitmap, 1);
|
|
- Bitmap->Color1A = color;
|
|
-
|
|
- RIVA_FIFO_FREE(Bitmap, 2);
|
|
- Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY;
|
|
- Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH;
|
|
-
|
|
FB_AddBusySurface(dst);
|
|
|
|
if ( dst == this->screen ) {
|
|
@@ -115,7 +91,6 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
|
|
int srcX, srcY;
|
|
int dstX, dstY;
|
|
int dstW, dstH;
|
|
- RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET);
|
|
|
|
/* FIXME: For now, only blit to display surface */
|
|
if ( dst->pitch != SDL_VideoSurface->pitch ) {
|
|
@@ -142,11 +117,6 @@ static int HWAccelBlit(SDL_Surface *src, SDL_Rect *srcrect,
|
|
dstX += dstrect->x;
|
|
dstY += dstrect->y;
|
|
|
|
- RIVA_FIFO_FREE(Blt, 3);
|
|
- Blt->TopLeftSrc = (srcY << 16) | srcX;
|
|
- Blt->TopLeftDst = (dstY << 16) | dstX;
|
|
- Blt->WidthHeight = (dstH << 16) | dstW;
|
|
-
|
|
FB_AddBusySurface(src);
|
|
FB_AddBusySurface(dst);
|
|
|
|
@@ -185,23 +155,15 @@ static int CheckHWBlit(_THIS, SDL_Surface *src, SDL_Surface *dst)
|
|
|
|
void FB_RivaAccel(_THIS, __u32 card)
|
|
{
|
|
- RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET);
|
|
|
|
/* We have hardware accelerated surface functions */
|
|
this->CheckHWBlit = CheckHWBlit;
|
|
wait_vbl = WaitVBL;
|
|
switch (card) {
|
|
- case FB_ACCEL_NV3:
|
|
- wait_idle = NV3WaitIdle;
|
|
- break;
|
|
- case FB_ACCEL_NV4:
|
|
- wait_idle = NV4WaitIdle;
|
|
- break;
|
|
default:
|
|
/* Hmm... FIXME */
|
|
break;
|
|
}
|
|
- FifoEmptyCount = Rop->FifoFree;
|
|
|
|
/* The Riva has an accelerated color fill */
|
|
this->info.blit_fill = 1;
|
|
diff --git a/src/video/fbcon/SDL_fbvideo.c b/src/video/fbcon/SDL_fbvideo.c
|
|
index 5e5880908..dee999cbd 100644
|
|
--- a/src/video/fbcon/SDL_fbvideo.c
|
|
+++ b/src/video/fbcon/SDL_fbvideo.c
|
|
@@ -46,7 +46,6 @@
|
|
#include "SDL_fbevents_c.h"
|
|
#include "SDL_fb3dfx.h"
|
|
#include "SDL_fbmatrox.h"
|
|
-#include "SDL_fbriva.h"
|
|
|
|
/*#define FBCON_DEBUG*/
|
|
|
|
@@ -769,13 +768,6 @@ static int FB_VideoInit(_THIS, SDL_PixelFormat *vformat)
|
|
#endif
|
|
FB_3DfxAccel(this, finfo.accel);
|
|
break;
|
|
- case FB_ACCEL_NV3:
|
|
- case FB_ACCEL_NV4:
|
|
-#ifdef FBACCEL_DEBUG
|
|
- printf("NVidia hardware accelerator!\n");
|
|
-#endif
|
|
- FB_RivaAccel(this, finfo.accel);
|
|
- break;
|
|
default:
|
|
#ifdef FBACCEL_DEBUG
|
|
printf("Unknown hardware accelerator.\n");
|