diff options
| author | notaz | 2015-02-06 01:29:00 +0200 |
|---|---|---|
| committer | notaz | 2015-02-06 01:29:00 +0200 |
| commit | 2af7e74feec67c0a798ac190774cb4b3e925be76 (patch) | |
| tree | 27a148679e25f6edb7a2dd85c54514139bb72450 /plugins/gpu_unai/gpu.cpp | |
| parent | cebb70f24ab54693b12aaa27b85a52689e26e1ff (diff) | |
| parent | 1e0eac2348343c8a046f7a75d460f087556cf7f6 (diff) | |
| download | pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.gz pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.bz2 pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'plugins/gpu_unai/gpu.cpp')
| -rw-r--r-- | plugins/gpu_unai/gpu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp index d509617..1552bed 100644 --- 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; |