ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zzogl-pg: Get rid of some old 64 bit code. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2799 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-03-31 12:17:05 +00:00
parent 9cd47bf995
commit fe8250967a
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/zzogl-pg/opengl/Regs.h
View File

@ -19,17 +19,7 @@
#ifndef __GSREGS_H__ #ifndef __GSREGS_H__
#define __GSREGS_H__ #define __GSREGS_H__
#ifdef _MSC_VER
typedef void (__fastcall *GIFRegHandler)(u32* data); typedef void (__fastcall *GIFRegHandler)(u32* data);
#else
#ifdef __x86_64__
typedef void (*GIFRegHandler)(u32* data);
#else
typedef void (__fastcall *GIFRegHandler)(u32* data);
#endif
#endif
void __fastcall GIFPackedRegHandlerNull(u32* data); void __fastcall GIFPackedRegHandlerNull(u32* data);
void __fastcall GIFPackedRegHandlerRGBA(u32* data); void __fastcall GIFPackedRegHandlerRGBA(u32* data);

4
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -1673,10 +1673,6 @@ inline list<CMemoryTarget>::iterator ZeroGS::CMemoryTargetMngr::DestroyTargetIte
return it; return it;
} }
#if defined(_MSC_VER) && defined(__x86_64__)
extern "C" void UnswizzleZ16Target(void* dst, void* src, int iters);
#endif
int MemoryTarget_CompareTarget (list<CMemoryTarget>::iterator& it, const tex0Info& tex0, int clutsize, int nClutOffset) { int MemoryTarget_CompareTarget (list<CMemoryTarget>::iterator& it, const tex0Info& tex0, int clutsize, int nClutOffset) {
if( PSMT_ISCLUT(it->psm) != PSMT_ISCLUT(tex0.psm) ) { if( PSMT_ISCLUT(it->psm) != PSMT_ISCLUT(tex0.psm) ) {
return 1; return 1;

11
plugins/zzogl-pg/opengl/x86.cpp
View File

@ -23,7 +23,7 @@
#include "Mem.h" #include "Mem.h"
#include "x86.h" #include "x86.h"
#if defined(ZEROGS_SSE2) && (defined(_WIN32)||defined(__x86_64__)) #if defined(ZEROGS_SSE2) && defined(_WIN32)
#include <xmmintrin.h> #include <xmmintrin.h>
#include <emmintrin.h> #include <emmintrin.h>
#endif #endif
@ -261,7 +261,7 @@ _FrameSwizzleBlock(A4_, (src[2*j]+src[2*j+1]+src[2*j+srcpitch]+src[2*j+srcpitch+
// } // }
//} //}
#if (defined(_WIN32)||defined(__x86_64__)) #if defined(_WIN32)
extern "C" void __fastcall WriteCLUT_T32_I8_CSM1_sse2(u32* vm, u32* clut) extern "C" void __fastcall WriteCLUT_T32_I8_CSM1_sse2(u32* vm, u32* clut)
{ {
@ -320,8 +320,6 @@ PCSX2_ALIGNED16(int s_clut16mask[8]) = { 0xffff0000, 0xffff0000, 0xffff0000, 0xf
0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff}; 0x0000ffff, 0x0000ffff, 0x0000ffff, 0x0000ffff};
} }
#if !defined(__x86_64__)
extern "C" void __fastcall WriteCLUT_T16_I4_CSM1_sse2(u32* vm, u32* clut) extern "C" void __fastcall WriteCLUT_T16_I4_CSM1_sse2(u32* vm, u32* clut)
{ {
__asm { __asm {
@ -436,7 +434,6 @@ WriteUnaligned:
End: End:
} }
} }
#endif // __x86_64__
#endif // _MSC_VER #endif // _MSC_VER
#endif // ZEROGS_SSE2 #endif // ZEROGS_SSE2
@ -542,9 +539,6 @@ void __fastcall WriteCLUT_T32_I4_CSM1_c(u32* vm, u32* clut)
void SSE2_UnswizzleZ16Target( u16* dst, u16* src, int iters ) { void SSE2_UnswizzleZ16Target( u16* dst, u16* src, int iters ) {
#if defined(_MSC_VER) #if defined(_MSC_VER)
# if defined(__x86_64__)
UnswizzleZ16Target(dst, src, iters);
# else
__asm { __asm {
mov edx, iters mov edx, iters
pxor xmm7, xmm7 pxor xmm7, xmm7
@ -593,7 +587,6 @@ Z16Loop:
sub edx, 1 sub edx, 1
jne Z16Loop jne Z16Loop
} }
# endif // __x86_64__
#else // _MSC_VER #else // _MSC_VER
__asm__(".intel_syntax\n" __asm__(".intel_syntax\n"