LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 06039b1e: Merge "opengles emulator: call XInitThreads in emulator_test_renderer"

Browse Source 
* commit '06039b1e3be0ace898f28c3f4742a2879d9767b9':
  opengles emulator: call XInitThreads in emulator_test_renderer
This commit is contained in:
David Turner
2011-08-15 09:56:32 -07:00
committed by Android Git Automerger
parent 3d9ae4e7df 06039b1e3b
commit 0315d71017
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/emulator/opengl/tests/emulator_test_renderer/main.cpp
View File

@@ -23,7 +23,11 @@
static int convert_keysym(int sym); // forward static int convert_keysym(int sym); // forward
#ifdef __linux__
#include <X11/Xlib.h>
#endif
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
#else #else
@@ -45,6 +49,14 @@ int main(int argc, char *argv[])
winHeight = height; winHeight = height;
} }
#ifdef __linux__
// some OpenGL implementations may call X functions
// it is safer to synchronize all X calls made by all the
// rendering threads. (although the calls we do are locked
// in the FrameBuffer singleton object).
XInitThreads();
#endif
// //
// Inialize SDL window // Inialize SDL window
// //