From 65a89d08b8d0f75ac3d3a96abe4e006769df1861 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Wed, 14 Nov 2012 02:15:54 +0100 Subject: [PATCH 1/2] Define XUSER_MAX_COUNT for those who don't have the DirectX SDK --- Windows/XinputDevice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Windows/XinputDevice.cpp b/Windows/XinputDevice.cpp index 3c1ac1041f..d6294ec8fb 100644 --- a/Windows/XinputDevice.cpp +++ b/Windows/XinputDevice.cpp @@ -3,6 +3,10 @@ #include #include +#ifndef XUSER_MAX_COUNT +#define XUSER_MAX_COUNT 4 +#endif + XinputDevice::XinputDevice() { ZeroMemory( &this->prevState, sizeof(this->prevState) ); this->check_delay = 0; From cace547f8a0215fb89d458aecb0fb37d149cfff9 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Thu, 15 Nov 2012 01:47:59 +0100 Subject: [PATCH 2/2] Fix colors for textures with 5551 clut Fixes NAMCO logo in the Tales of Eternia intro, which is now red. --- GPU/GLES/TextureCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 4c0135258c..6066af4fb9 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -477,7 +477,7 @@ void convertColors(u8 *finalBuf, GLuint dstFmt, int numPixels) u16 *p = (u16 *)finalBuf; for (int i = 0; i < numPixels; i++) { u16 c = p[i]; - p[i] = ((c & 0x8000) >> 15) | (c << 1); + p[i] = ((c & 0x8000) >> 15) | ((c >> 9) & 0x3E) | ((c << 1) & 0x7C0) | ((c << 11) & 0xF800); } } break;