From: notaz Date: Thu, 11 Aug 2011 15:54:42 +0000 (+0300) Subject: gpu_unai: merge code from PCSX4ALL 2.2 release X-Git-Tag: r9~16 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53636f1583b53672d6908eff1aeff7213ee11e34;p=pcsx_rearmed.git gpu_unai: merge code from PCSX4ALL 2.2 release --- diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp index 4ee453df..ea983645 100644 --- 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=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 5d370f88..4b338f70 100644 --- 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(;yaxmax) || (xb xmax) xb = xmax; - xb-=xa; - if(xb>0) gpuPolySpanDriver(PixelBase + xa,xb); - } - } - else - { - bool flag=progressInterlace_flag; - for(;yaxmax) || (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 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(;yaxmax) || (xb 0) { - if (ya&li) continue; - xa = x2i(x3); - xb = x2i(x4); - if( (xa>xmax) || (xb 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(;yaxmax) || (xb 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(;yaxmax) || (xb 0) { - if (ya&li) continue; - xa = x2i(x3); - xb = x2i(x4); - if( (xa>xmax) || (xb 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(;yaxmax) || (xb 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(;yaxmax) || (xb 0) { - if (ya&li) continue; - xa = x2i(x3); - xb = x2i(x4); - if( (xa>xmax) || (xb 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(;yaxmax) || (xb 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); } } }