am 5db1600b: am 82217072: Merge "OpenGL renderer: handling subwindow messages"

* commit '5db1600b1a2fa07870d6bdd2f5c1833cc0a26610':
  OpenGL renderer: handling subwindow messages
This commit is contained in:
David Turner
2011-07-06 07:46:32 -07:00
committed by Android Git Automerger
2 changed files with 26 additions and 1 deletions

View File

@@ -73,7 +73,7 @@ public:
EGLDisplay getDisplay() const { return m_eglDisplay; } EGLDisplay getDisplay() const { return m_eglDisplay; }
EGLContext getContext() const { return m_eglContext; } EGLContext getContext() const { return m_eglContext; }
EGLNativeWindowType getSubWindow() const { return m_subWin; }
bool bind_locked(); bool bind_locked();
bool unbind_locked(); bool unbind_locked();

View File

@@ -125,7 +125,32 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
#ifndef _WIN32
//
// run the server listener loop
//
server->Main(); // never returns server->Main(); // never returns
#else
//
// on windows we need to handle messages for the
// created subwindow. So we run the server on a seperate
// thread and running the windows message pump loop
// in this main thread.
//
server->start();
//
// Dispatch events for the subwindow
//
MSG msg;
HWND hWnd = FrameBuffer::getFB()->getSubWindow();
bool done = 0;
while(!done) {
GetMessage(&msg, hWnd, 0, 0);
TranslateMessage(&msg);
DispatchMessage(&msg);
}
#endif
return 0; return 0;
} }