Merge branch 'master' of github.com:hrydgard/ppsspp

This commit is contained in:
Henrik Rydgard committed 2012-11-15 10:16:07 +01:00
commit a8709b5df1
2 files changed
+5 -1

No files matched your search

+1 -1
View File
@@ -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;
+4
View File
@@ -3,6 +3,10 @@
#include <limits.h>
#include <iostream>
#ifndef XUSER_MAX_COUNT
#define XUSER_MAX_COUNT 4
#endif
XinputDevice::XinputDevice() {
ZeroMemory( &this->prevState, sizeof(this->prevState) );
this->check_delay = 0;