gpu_unai: merge code from PCSX4ALL 2.2 release

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index 4ee453d..ea98364 100644 (file)
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -24,25 +24,28 @@
 #include "debug.h"
 
 int skipCount = 2; /* frame skip (0,1,2,3...) */
-int skCount=0; /* internal frame skip */
+int skCount = 0; /* internal frame skip */
 int linesInterlace = 0;  /* internal lines interlace */
 int linesInterlace_user = 0; /* Lines interlace */
 
-bool isSkip=false; /* skip frame (info coming from GPU) */
-bool skipFrame=false; /* skip frame (according to frame skip) */
+bool isSkip = false; /* skip frame (info coming from GPU) */
+bool skipFrame = false; /* skip frame (according to frame skip) */
 bool alt_fps = false; /* Alternative FPS algorithm */
 bool show_fps = false; /* Show FPS statistics */
 
-bool isPAL=false; /* PAL video timing */
+bool isPAL = false; /* PAL video timing */
 bool progressInterlace_flag = false; /* Progressive interlace flag */
 bool progressInterlace = false; /* Progressive interlace option*/
 bool frameLimit = false; /* frames to wait */
+
 bool light = true; /* lighting */
 bool blend = true; /* blending */
-
+bool FrameToRead = false; /* load image in progress */
+bool FrameToWrite = false; /* store image in progress */
 bool fb_dirty = false;
 
 bool enableAbbeyHack = false; /* Abe's Odyssey hack */
+
 u8 BLEND_MODE;
 u8 TEXT_MODE;
 u8 Masking;
@@ -60,9 +63,6 @@ s32           px,py;
 s32            x_end,y_end;
 u16*  pvram;
 
-u32 FrameToRead;
-u32 FrameToWrite;
-
 u32 GP0;
 s32 PacketCount;
 s32 PacketIndex;
@@ -284,7 +284,7 @@ void  GPU_writeDataMem(u32* dmaAddress, s32 dmaCount)
                                        pvram += 1024;
                                        if (++py>=y_end) 
                                        {
-                                               FrameToWrite = 0;
+                                               FrameToWrite = false;
                                                GPU_GP1 &= ~0x08000000;
                                                break;
                                        }
@@ -297,7 +297,7 @@ void  GPU_writeDataMem(u32* dmaAddress, s32 dmaCount)
                                        pvram += 1024;
                                        if (++py>=y_end) 
                                        {
-                                               FrameToWrite = 0;
+                                               FrameToWrite = false;
                                                GPU_GP1 &= ~0x08000000;
                                                break;
                                        }
@@ -385,7 +385,7 @@ void  GPU_writeData(u32 data)
                        pvram += 1024;
                        if (++py>=y_end) 
                        {
-                               FrameToWrite = 0;
+                               FrameToWrite = false;
                                GPU_GP1 &= ~0x08000000;
                        }
                }
@@ -399,7 +399,7 @@ void  GPU_writeData(u32 data)
                                pvram += 1024;
                                if (++py>=y_end) 
                                {
-                                       FrameToWrite = 0;
+                                       FrameToWrite = false;
                                        GPU_GP1 &= ~0x08000000;
                                }
                        }
@@ -452,7 +452,7 @@ void  GPU_readDataMem(u32* dmaAddress, s32 dmaCount)
                        pvram += 1024;
                        if (++py>=y_end) 
                        {
-                               FrameToRead = 0;
+                               FrameToRead = false;
                                GPU_GP1 &= ~0x08000000;
                                break;
                        }
@@ -485,7 +485,7 @@ u32  GPU_readData(void)
                        pvram += 1024;
                        if (++py>=y_end) 
                        {
-                               FrameToRead = 0;
+                               FrameToRead = false;
                                GPU_GP1 &= ~0x08000000;
                        }
                }
@@ -497,7 +497,7 @@ u32  GPU_readData(void)
                        pvram +=1024;
                        if (++py>=y_end) 
                        {
-                               FrameToRead = 0;
+                               FrameToRead = false;
                                GPU_GP1 &= ~0x08000000;
                        }
                }
@@ -533,11 +533,11 @@ void  GPU_writeStatus(u32 data)
                break;
        case 0x01:
                GPU_GP1 &= ~0x08000000;
-               PacketCount = FrameToRead = FrameToWrite = 0;
+               PacketCount = 0; FrameToRead = FrameToWrite = false;
                break;
        case 0x02:
                GPU_GP1 &= ~0x08000000;
-               PacketCount = FrameToRead = FrameToWrite = 0;
+               PacketCount = 0; FrameToRead = FrameToWrite = false;
                break;
        case 0x03:
                GPU_GP1 = (GPU_GP1 & ~0x00800000) | ((data & 1) << 23);
@@ -638,15 +638,16 @@ INLINE void gpuVideoOutput(void)
        int incY = (h0==480) ? 2 : 1;
        h0=(h0==480 ? 2048 : 1024);
 
-       if (!progressInterlace)
        {
                const int li=linesInterlace;
+               bool pi=progressInterlace;
+               bool pif=progressInterlace_flag;
                switch ( w0 )
                {
                        case 256:
                                for(int y1=y0+h1; y0<y1; y0+=incY)
                                {
-                                       if( 0 == (y0&li) ) GPU_BlitWWDWW(       src_screen16,   dest_screen16, isRGB24);
+                                       if(( 0 == (y0&li) ) && ((!pi) || (pif=!pif))) GPU_BlitWWDWW(    src_screen16,   dest_screen16, isRGB24);
                                        dest_screen16 += VIDEO_WIDTH;
                                        src_screen16  += h0;
                                }
@@ -654,7 +655,7 @@ INLINE void gpuVideoOutput(void)
                        case 368:
                                for(int y1=y0+h1; y0<y1; y0+=incY)
                                {
-                                       if( 0 == (y0&li) ) GPU_BlitWWWWWWWWS(   src_screen16,   dest_screen16, isRGB24, 4);
+                                       if(( 0 == (y0&li) ) && ((!pi) || (pif=!pif))) GPU_BlitWWWWWWWWS(        src_screen16,   dest_screen16, isRGB24, 4);
                                        dest_screen16 += VIDEO_WIDTH;
                                        src_screen16  += h0;
                                }
@@ -662,7 +663,7 @@ INLINE void gpuVideoOutput(void)
                        case 320:
                                for(int y1=y0+h1; y0<y1; y0+=incY)
                                {
-                                       if( 0 == (y0&li) ) GPU_BlitWW(  src_screen16,   dest_screen16, isRGB24);
+                                       if(( 0 == (y0&li) ) && ((!pi) || (pif=!pif))) GPU_BlitWW(       src_screen16,   dest_screen16, isRGB24);
                                        dest_screen16 += VIDEO_WIDTH;
                                        src_screen16  += h0;
                                }
@@ -670,7 +671,7 @@ INLINE void gpuVideoOutput(void)
                        case 384:
                                for(int y1=y0+h1; y0<y1; y0+=incY)
                                {
-                                       if( 0 == (y0&li) ) GPU_BlitWWWWWS(      src_screen16,   dest_screen16, isRGB24);
+                                       if(( 0 == (y0&li) ) && ((!pi) || (pif=!pif))) GPU_BlitWWWWWS(   src_screen16,   dest_screen16, isRGB24);
                                        dest_screen16 += VIDEO_WIDTH;
                                        src_screen16  += h0;
                                }
@@ -678,7 +679,7 @@ INLINE void gpuVideoOutput(void)
                        case 512:
                                for(int y1=y0+h1; y0<y1; y0+=incY)
                                {
-                                       if( 0 == (y0&li) ) GPU_BlitWWSWWSWS(    src_screen16, dest_screen16, isRGB24);
+                                       if(( 0 == (y0&li) ) && ((!pi) || (pif=!pif))) GPU_BlitWWSWWSWS( src_screen16, dest_screen16, isRGB24);
                                        dest_screen16 += VIDEO_WIDTH;
                                        src_screen16  += h0;
                                }
@@ -686,69 +687,13 @@ INLINE void gpuVideoOutput(void)
                        case 640:
                                for(int y1=y0+h1; y0<y1; y0+=incY)
                                {
-                                       if( 0 == (y0&li) ) GPU_BlitWS(  src_screen16, dest_screen16, isRGB24);
+                                       if(( 0 == (y0&li) ) && ((!pi) || (pif=!pif))) GPU_BlitWS(       src_screen16, dest_screen16, isRGB24);
                                        dest_screen16 += VIDEO_WIDTH;
                                        src_screen16  += h0;
                                }
                                break;
                }
-       }
-       else
-       {
-               const int li=linesInterlace;
-               bool flag=progressInterlace_flag; /* progressive interlace */
-               switch ( w0 )
-               {
-                       case 256:
-                               for(int y1=y0+h1; y0<y1; y0+=incY)
-                               {
-                                       if(( 0 == (y0&li) ) && (flag=!flag)) GPU_BlitWWDWW(     src_screen16,   dest_screen16, isRGB24);
-                                       dest_screen16 += VIDEO_WIDTH;
-                                       src_screen16  += h0;
-                               }
-                               break;
-                       case 368:
-                               for(int y1=y0+h1; y0<y1; y0+=incY)
-                               {
-                                       if(( 0 == (y0&li) ) && (flag=!flag)) GPU_BlitWWWWWWWWS( src_screen16,   dest_screen16, isRGB24, 4);
-                                       dest_screen16 += VIDEO_WIDTH;
-                                       src_screen16  += h0;
-                               }
-                               break;
-                       case 320:
-                               for(int y1=y0+h1; y0<y1; y0+=incY)
-                               {
-                                       if(( 0 == (y0&li) ) && (flag=!flag)) GPU_BlitWW(        src_screen16,   dest_screen16, isRGB24);
-                                       dest_screen16 += VIDEO_WIDTH;
-                                       src_screen16  += h0;
-                               }
-                               break;
-                       case 384:
-                               for(int y1=y0+h1; y0<y1; y0+=incY)
-                               {
-                                       if(( 0 == (y0&li) ) && (flag=!flag)) GPU_BlitWWWWWS(    src_screen16,   dest_screen16, isRGB24);
-                                       dest_screen16 += VIDEO_WIDTH;
-                                       src_screen16  += h0;
-                               }
-                               break;
-                       case 512:
-                               for(int y1=y0+h1; y0<y1; y0+=incY)
-                               {
-                                       if(( 0 == (y0&li) ) && (flag=!flag)) GPU_BlitWWSWWSWS(  src_screen16, dest_screen16, isRGB24);
-                                       dest_screen16 += VIDEO_WIDTH;
-                                       src_screen16  += h0;
-                               }
-                               break;
-                       case 640:
-                               for(int y1=y0+h1; y0<y1; y0+=incY)
-                               {
-                                       if(( 0 == (y0&li) ) && (flag=!flag)) GPU_BlitWS(        src_screen16, dest_screen16, isRGB24);
-                                       dest_screen16 += VIDEO_WIDTH;
-                                       src_screen16  += h0;
-                               }
-                               break;
-               }
-               progressInterlace_flag=!flag;
+               progressInterlace_flag=!progressInterlace_flag;
        }
        video_flip();
 }
@@ -797,7 +742,7 @@ void  GPU_updateLace(void)
        GPU_GP1 ^= 0x80000000;
 
        // Update display
-       if ((!skipFrame) && (!isSkip) && (!(((GPU_GP1&0x08000000))||((GPU_GP1&0x00800000)))))
+       if ((!skipFrame) && (!isSkip) && (fb_dirty) && (!(((GPU_GP1&0x08000000))||((GPU_GP1&0x00800000)))))
        {
                gpuVideoOutput(); // Display updated
 
@@ -811,18 +756,18 @@ void  GPU_updateLace(void)
                        linesInterlace = linesInterlace_user; // resolution changed from 480 to lower one
                        video_clear();
                }
+       }
 
-               // Limit FPS
-               if (frameLimit)
+       // Limit FPS
+       if (frameLimit)
+       {
+               static unsigned next=get_ticks();
+               if (!skipFrame)
                {
-                       static unsigned next=get_ticks();
                        unsigned now=get_ticks();
-                       if (!skipFrame)
-                       {
-                               if (now<next) wait_ticks(next-now);
-                       }
-                       next+=(isPAL?(1000000/50):((unsigned)(1000000.0/59.94)));
+                       if (now<next) wait_ticks(next-now);
                }
+               next+=(isPAL?(1000000/50):((unsigned)(1000000.0/59.94)));
        }
 
        // Show FPS statistics
@@ -830,7 +775,7 @@ void  GPU_updateLace(void)
        {
                static u32 real_fps=0;
                static u32 prev=get_ticks();
-               static char msg[24]="FPS=000/00 SPD=000%";
+               static char msg[32]="FPS=000/00 SPD=000%";
                u32 now=get_ticks();
                real_fps++;
                if ((now-prev)>=1000000)
@@ -861,6 +806,7 @@ void  GPU_updateLace(void)
                        isSkip=true;
                }
        }
+       fb_dirty=false;
 
        pcsx4all_prof_end_with_resume(PCSX4ALL_PROF_GPU,PCSX4ALL_PROF_COUNTERS);
 }

diff --git a/plugins/gpu_unai/gpu_raster_polygon.h b/plugins/gpu_unai/gpu_raster_polygon.h
index 5d370f8..4b338f7 100644 (file)
--- a/plugins/gpu_unai/gpu_raster_polygon.h
+++ b/plugins/gpu_unai/gpu_raster_polygon.h
@@ -135,34 +135,16 @@ void gpuDrawF3(const PP gpuPolySpanDriver)
 
                u16* PixelBase  = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(0, ya)];
                
-               if (!progressInterlace)
+               for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4)
                {
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4)
-                       {
-                               if (ya&li) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin) ) continue;
-                               if(xa < xmin) xa = xmin;
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
-                       }
-               }
-               else
-               {
-                       bool flag=progressInterlace_flag;
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4)
-                       {
-                               if ((ya&li) && (flag=!flag)) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin) ) continue;
-                               if(xa < xmin) xa = xmin;
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
-                       }
+                       if (ya&li) continue;
+                       xa = x2i(x3);
+                       xb = x2i(x4);
+                       if( (xa>xmax) || (xb<xmin) ) continue;
+                       if(xa < xmin) xa = xmin;
+                       if(xb > xmax) xb = xmax;
+                       xb-=xa;
+                       if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
                }
        }
 }
@@ -328,58 +310,28 @@ void gpuDrawFT3(const PP gpuPolySpanDriver)
 
                u16* PixelBase  = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(0, ya)];
 
-               if (!progressInterlace)
+               for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, u3+=du3, v3+=dv3)
                {
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, u3+=du3, v3+=dv3)
+                       if (ya&li) continue;
+                       xa = x2i(x3);
+                       xb = x2i(x4);
+                       if( (xa>xmax) || (xb<xmin) ) continue;
+
+                       temp = xmin - xa;
+                       if(temp > 0)
                        {
-                               if (ya&li) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin) ) continue;
-
-                               temp = xmin - xa;
-                               if(temp > 0)
-                               {
-                                       xa  = xmin;
-                                       u4 = u3 + du4*temp;
-                                       v4 = v3 + dv4*temp;
-                               }
-                               else
-                               {
-                                       u4 = u3;
-                                       v4 = v3;
-                               }
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
+                               xa  = xmin;
+                               u4 = u3 + du4*temp;
+                               v4 = v3 + dv4*temp;
                        }
-               }
-               else
-               {
-                       bool flag=progressInterlace_flag;
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, u3+=du3, v3+=dv3)
+                       else
                        {
-                               if ((ya&li) && (flag=!flag)) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin) ) continue;
-
-                               temp = xmin - xa;
-                               if(temp > 0)
-                               {
-                                       xa  = xmin;
-                                       u4 = u3 + du4*temp;
-                                       v4 = v3 + dv4*temp;
-                               }
-                               else
-                               {
-                                       u4 = u3;
-                                       v4 = v3;
-                               }
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
+                               u4 = u3;
+                               v4 = v3;
                        }
+                       if(xb > xmax) xb = xmax;
+                       xb-=xa;
+                       if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
                }
        }
 }
@@ -542,54 +494,26 @@ void gpuDrawG3(const PP gpuPolySpanDriver)
 
                u16* PixelBase  = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(0, ya)];
                
-               if (!progressInterlace)
+               for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, r3+=dr3, g3+=dg3, b3+=db3)
                {
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, r3+=dr3, g3+=dg3, b3+=db3)
+                       if (ya&li) continue;
+                       xa = x2i(x3);
+                       xb = x2i(x4);
+                       if( (xa>xmax) || (xb<xmin) ) continue;
+
+                       temp = xmin - xa;
+                       if(temp > 0)
                        {
-                               if (ya&li) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin) ) continue;
-
-                               temp = xmin - xa;
-                               if(temp > 0)
-                               {
-                                       xa  = xmin;
-                                       r4 = r3 + dr4*temp;   g4 = g3 + dg4*temp;   b4 = b3 + db4*temp;
-                               }
-                               else
-                               {
-                                       r4 = r3;  g4 = g3;  b4 = b3;
-                               }
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
+                               xa  = xmin;
+                               r4 = r3 + dr4*temp;   g4 = g3 + dg4*temp;   b4 = b3 + db4*temp;
                        }
-               }
-               else
-               {
-                       bool flag=progressInterlace_flag;
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, r3+=dr3, g3+=dg3, b3+=db3)
+                       else
                        {
-                               if ((ya&li) && (flag=!flag)) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin) ) continue;
-
-                               temp = xmin - xa;
-                               if(temp > 0)
-                               {
-                                       xa  = xmin;
-                                       r4 = r3 + dr4*temp;   g4 = g3 + dg4*temp;   b4 = b3 + db4*temp;
-                               }
-                               else
-                               {
-                                       r4 = r3;  g4 = g3;  b4 = b3;
-                               }
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
+                               r4 = r3;  g4 = g3;  b4 = b3;
                        }
+                       if(xb > xmax) xb = xmax;
+                       xb-=xa;
+                       if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
                }
        }
 }
@@ -780,58 +704,28 @@ void gpuDrawGT3(const PP gpuPolySpanDriver)
                r3+= fixed_HALF;  g3+= fixed_HALF;  b3+= fixed_HALF;
                u16* PixelBase  = &((u16*)GPU_FrameBuffer)[FRAME_OFFSET(0, ya)];
                
-               if (!progressInterlace)
+               for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, u3+=du3, v3+=dv3, r3+=dr3, g3+=dg3,        b3+=db3)
                {
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, u3+=du3, v3+=dv3, r3+=dr3, g3+=dg3,        b3+=db3)
+                       if (ya&li) continue;
+                       xa = x2i(x3);
+                       xb = x2i(x4);
+                       if( (xa>xmax) || (xb<xmin))     continue;
+
+                       temp = xmin - xa;
+                       if(temp > 0)
                        {
-                               if (ya&li) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if( (xa>xmax) || (xb<xmin))     continue;
-
-                               temp = xmin - xa;
-                               if(temp > 0)
-                               {
-                                       xa  = xmin;
-                                       u4 = u3 + du4*temp;   v4 = v3 + dv4*temp;
-                                       r4 = r3 + dr4*temp;   g4 = g3 + dg4*temp;   b4 = b3 + db4*temp;
-                               }
-                               else
-                               {
-                                       u4 = u3;  v4 = v3;
-                                       r4 = r3;  g4 = g3;  b4 = b3;
-                               }
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
+                               xa  = xmin;
+                               u4 = u3 + du4*temp;   v4 = v3 + dv4*temp;
+                               r4 = r3 + dr4*temp;   g4 = g3 + dg4*temp;   b4 = b3 + db4*temp;
                        }
-               }
-               else
-               {
-                       bool flag=progressInterlace_flag;
-                       for(;ya<yb;++ya, PixelBase += FRAME_WIDTH, x3+=dx3, x4+=dx4, u3+=du3, v3+=dv3, r3+=dr3, g3+=dg3,        b3+=db3)
+                       else
                        {
-                               if ((ya&li) && (flag=!flag)) continue;
-                               xa = x2i(x3);
-                               xb = x2i(x4);
-                               if ((xa>xmax) || (xb<xmin))     continue;
-
-                               temp = xmin - xa;
-                               if(temp > 0)
-                               {
-                                       xa  = xmin;
-                                       u4 = u3 + du4*temp;   v4 = v3 + dv4*temp;
-                                       r4 = r3 + dr4*temp;   g4 = g3 + dg4*temp;   b4 = b3 + db4*temp;
-                               }
-                               else
-                               {
-                                       u4 = u3;  v4 = v3;
-                                       r4 = r3;  g4 = g3;  b4 = b3;
-                               }
-                               if(xb > xmax) xb = xmax;
-                               xb-=xa;
-                               if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
+                               u4 = u3;  v4 = v3;
+                               r4 = r3;  g4 = g3;  b4 = b3;
                        }
+                       if(xb > xmax) xb = xmax;
+                       xb-=xa;
+                       if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb);
                }
        }
 }