diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-09-23 21:28:57 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-09-23 21:28:57 +0000 |
| commit | a602f4591fefa9e560a49395c9d4a7a6a126a4c5 (patch) | |
| tree | 99e57afaa380c70bd5ba02ece871eacd7dd3240a /macosx/plugins/DFXVideo/macsrc/PluginGLView.m | |
| parent | e81974f7ecc531f43d42180985b9cb37ffb96934 (diff) | |
| download | pcsxr-a602f4591fefa9e560a49395c9d4a7a6a126a4c5.tar.gz | |
Quieting a warning in OS X localization implementation.
Fixing a few bugs on the OS X Software Shader support, and adding a quality selector.
Changing the hacks type used in the Mac preference selector from unsigned long to unsigned int.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@79982 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc/PluginGLView.m')
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/PluginGLView.m | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index 2c79436b..1836ebcd 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -155,10 +155,8 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) if(isShaderEnabled()){ // --- Params --- - shaderQuality = 4.0; - //vertexShader = LoadShader(GL_VERTEX_SHADER,"/Users/you/shader/gpuPeteOGL2.slv"); + shaderQuality = PSXShaderQuality(); vertexShader = [self loadShader:GL_VERTEX_SHADER location:PSXVertexShader()]; - //fragmentShader = LoadShader(GL_FRAGMENT_SHADER,"/Users/you/shader/gpuPeteOGL2.slf"); fragmentShader = [self loadShader:GL_FRAGMENT_SHADER location:PSXFragmentShader()]; //--- shader loading --- @@ -660,7 +658,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) GLuint lu2 = *((GLuint *)pD+1); GLuint lu3 = *((GLuint *)pD+2); GLuint *dst = ((GLuint *)((surf)+(column*lPitch)+(row<<2))); -#ifdef __POWERPC__ +#ifdef __BIG_ENDIAN__ *(dst)= (((lu1>>24)&0xff)<<16)|(((lu1>>16)&0xff)<<8)|(((lu1>>8)&0xff)); *(dst+1)= |