diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 9c958d1889..dd4e21d435 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -371,7 +371,6 @@ set(pcsx2GuiHeaders # IPU sources set(pcsx2IPUSources - IPU/coroutine.cpp IPU/IPU.cpp IPU/IPU_Fifo.cpp IPU/mpeg2lib/Idct.cpp @@ -380,7 +379,6 @@ set(pcsx2IPUSources # IPU headers set(pcsx2IPUHeaders - IPU/coroutine.h IPU/IPU.h IPU/IPU_Fifo.h IPU/yuv2rgb.h) @@ -554,13 +552,11 @@ set(pcsx2x86Headers # colect .asm files set(pcsx2AsmFiles - IPU/acoroutine.asm IPU/yuv2rgb.asm x86/ix86-32/aVif_proc-32.asm) # collect .S files set(pcsx2SSources - IPU/acoroutine.S x86/aVUzerorec.S) # change language of .S-files to c++ diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp index 7b422b6c8d..ccb68007a7 100644 --- a/pcsx2/IPU/IPU.cpp +++ b/pcsx2/IPU/IPU.cpp @@ -975,7 +975,7 @@ u8 __fastcall getBits128(u8 *address, u32 advance) notMask.lo = ~mask.lo & data.lo; notMask.hi = ~mask.hi & data.hi; notMask.lo >>= 8 - shift; - notMask.lo |= (notMask.hi & (0xFFFFFFFFFFFFFFFF >> (64 - shift))) << (64 - shift); + notMask.lo |= (notMask.hi & (0xFFFFFFFFFFFFFFFFLLU >> (64 - shift))) << (64 - shift); notMask.hi >>= 8 - shift; mask.hi = (((*(u128*)readpos).hi & mask.hi) << shift) | (((*(u128*)readpos).lo & mask.lo) >> (64 - shift)); diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index f8249b1c1a..6b6640528b 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -239,9 +239,6 @@ - - - diff --git a/plugins/zzogl-pg/opengl/ZZoglCRTC.cpp b/plugins/zzogl-pg/opengl/ZZoglCRTC.cpp index 8768b2b97f..31b8d2be8f 100644 --- a/plugins/zzogl-pg/opengl/ZZoglCRTC.cpp +++ b/plugins/zzogl-pg/opengl/ZZoglCRTC.cpp @@ -155,7 +155,6 @@ inline void FrameObtainDispinfo(u32 bInterlace, tex0Info* dispinfo) } GSRegDISPFB* pfb = i ? DISPFB2 : DISPFB1; - GSRegDISPLAY* pd = i ? DISPLAY2 : DISPLAY1; int magh = pd->MAGH + 1; int magv = pd->MAGV + 1; @@ -177,7 +176,7 @@ inline void FrameObtainDispinfo(u32 bInterlace, tex0Info* dispinfo) } -// Something should be done before Renderer the picture. +// Something should be done before Renderering the picture. inline void RenderStartHelper(u32 bInterlace) { // Crashes Final Fantasy X at startup if uncommented. --arcum42 @@ -236,11 +235,11 @@ inline void RenderStartHelper(u32 bInterlace) if (bInterlace) g_PrevBitwiseTexX = -1; // reset since will be using } -// It is setting for intrelace texture multiplied vector; -// Idea is: (x, y) -- position on screen, than interlaced texture get F = 1 ot 0 depends -// on image y coord. So it we write valpha.z * F + valpha.w + 0.5 it would be swicthig odd -// and even strings at each frame -// valpha.x and y used for image blending. +// Settings for interlace texture multiplied vector; +// The idea is: (x, y) -- position on screen, then interlaced texture get F = 1 or 0 depending +// on image y coords. So if we write valpha.z * F + valpha.w + 0.5, it would be switching odd +// and even strings at each frame. +// valpha.x and y are used for image blending. inline Vector RenderGetForClip(u32 bInterlace, int interlace, int psm, FRAGMENTSHADER* prog) { SetShaderCaller("RenderGetForClip"); @@ -261,7 +260,7 @@ inline Vector RenderGetForClip(u32 bInterlace, int interlace, int psm, FRAGMENTS if (bInterlace) { - if (interlace == (conf.interlace&1)) + if (interlace == (conf.interlace & 1)) { // pass if odd valpha.z = 1.0f; @@ -445,8 +444,8 @@ inline Vector RenderSetTargetBitTex(float th, float tw, float dh, float dw, bool return v; } -// Translator for POSITION coordinats (-1.0:+1.0f at x axis, +1.0f:-1.0y at y) into target frame ones -// We don't need x coordinate, bvecause interlacing is y-axis only. +// Translator for POSITION coordinates (-1.0:+1.0f at x axis, +1.0f:-1.0y at y) into target frame ones. +// We don't need x coordinate, because interlacing is y-axis only. inline Vector RenderSetTargetBitTrans(int th) { SetShaderCaller("RenderSetTargetBitTrans"); @@ -873,5 +872,3 @@ void ZeroGS::RenderCRTC(int interlace) AfterRendererSwitchBackToTextures(); AfterRendererAutoresetTargets(); } - -