From ea7338ddf9678665f8f59948225077d24afa3a93 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Fri, 11 Nov 2011 12:08:23 +0000 Subject: 10797, 10798 (MaddTheSane). git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72170 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFXVideo/macsrc/PluginGLView.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'macosx/plugins/DFXVideo/macsrc/PluginGLView.m') diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index dc4e7dc4..6046fe79 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -527,7 +527,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) unsigned char * surf; long x = PSXDisplay.DisplayPosition.x; long y = PSXDisplay.DisplayPosition.y; - unsigned long lu; + GLuint lu; unsigned short row,column; unsigned short dx=(unsigned short)PSXDisplay.DisplayEnd.x;//PreviousPSXDisplay.Range.x1; unsigned short dy=(unsigned short)PSXDisplay.DisplayEnd.y;//PreviousPSXDisplay.DisplayMode.y; @@ -577,10 +577,10 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) for(;row>24)&0xff)<<16)|(((lu1>>16)&0xff)<<8)|(((lu1>>8)&0xff)); @@ -615,9 +615,9 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) else { int LineOffset,SurfOffset; - unsigned long * SRCPtr = (unsigned long *)(psxVuw + (y << 10) + x); - unsigned long * DSTPtr = - ((unsigned long *)surf) + (PreviousPSXDisplay.Range.x0 >> 1); + GLuint * SRCPtr = (GLuint *)(psxVuw + (y << 10) + x); + GLuint * DSTPtr = + ((GLuint *)surf) + (PreviousPSXDisplay.Range.x0 >> 1); dx >>= 1; -- cgit v1.2.3