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; 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;