gpu_unai: fix some 64bit issues

[pcsx_rearmed.git] / plugins / gpu_unai / gpu.cpp

diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index c111d78..1552bed 100644 (file)
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -432,7 +432,7 @@ void  GPU_readDataMem(u32* dmaAddress, s32 dmaCount)
        {
                if ((&pvram[px])>(VIDEO_END)) pvram-=512*1024;
                // lower 16 bit
-               u32 data = (unsigned long)pvram[px];
+               u32 data = pvram[px];
 
                if (++px>=x_end) 
                {
@@ -442,7 +442,7 @@ void  GPU_readDataMem(u32* dmaAddress, s32 dmaCount)
 
                if ((&pvram[px])>(VIDEO_END)) pvram-=512*1024;
                // higher 16 bit (always, even if it's an odd width)
-               data |= (unsigned long)(pvram[px])<<16;
+               data |= (u32)(pvram[px])<<16;
                
                *dmaAddress++ = data;
 
@@ -819,7 +819,6 @@ void  GPU_updateLace(void)
 #else
 
 #include "../../frontend/plugin_lib.h"
-#include "../gpulib/cspace.h"
 
 extern "C" {
 
@@ -850,7 +849,7 @@ static void blit(void)
                old_res_horz = w0;
                old_res_vert = h1;
                old_rgb24 = (s16)isRGB24;
-               cbs->pl_vout_set_mode(w0, h1, isRGB24 ? 24 : 16);
+               cbs->pl_vout_set_mode(w0, h1, w0, h1, isRGB24 ? 24 : 16);
        }
 
        cbs->pl_vout_flip(base, 1024, isRGB24, w0, h1);