mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 19:13:40 +01:00
Merge branch 'master' of github.com:hrydgard/ppsspp
This commit is contained in:
commit
a8709b5df1
2 files changed
+5
-1
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user