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

am 698014ea: am 36371ff3: Merge "opengles emulator: do single display connection for all subwindow"

Browse Source 
* commit '698014ea6faf5f3445fc10c97270e11a7afa50d1':
  opengles emulator: do single display connection for all subwindow
This commit is contained in:
David Turner
2011-08-15 10:25:51 -07:00
committed by Android Git Automerger
parent 0a4e10bb49 698014ea6f
commit b0892c5572
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/emulator/opengl/host/libs/libOpenglRender/NativeLinuxSubWindow.cpp
View File

@@ -15,17 +15,34 @@
*/ */
#include "NativeSubWindow.h" #include "NativeSubWindow.h"
static Bool WaitForMapNotify(Display *d, XEvent *e, char *arg)
{
if (e->type == MapNotify && e->xmap.window == (Window)arg) {
return 1;
}
return 0;
}
static Display *s_display = NULL;
EGLNativeWindowType createSubWindow(FBNativeWindowType p_window, EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
EGLNativeDisplayType* display_out, EGLNativeDisplayType* display_out,
int x, int y,int width, int height){ int x, int y,int width, int height){
*display_out = XOpenDisplay(NULL);
Window win = XCreateWindow(*display_out,p_window,x,y, width,height,0,CopyFromParent,CopyFromParent,CopyFromParent,0,NULL); // The call to this function is protected by a lock
// in FrameBuffer so it is safe to check and initialize s_display here
if (!s_display) s_display = XOpenDisplay(NULL);
*display_out = s_display;
XSetWindowAttributes wa;
wa.event_mask = StructureNotifyMask;
Window win = XCreateWindow(*display_out,p_window,x,y, width,height,0,CopyFromParent,CopyFromParent,CopyFromParent,CWEventMask,&wa);
XMapWindow(*display_out,win); XMapWindow(*display_out,win);
XSync(*display_out,False); XEvent e;
XIfEvent(*display_out, &e, WaitForMapNotify, (char *)win);
return win; return win;
} }
void destroySubWindow(EGLNativeDisplayType dis,EGLNativeWindowType win){ void destroySubWindow(EGLNativeDisplayType dis,EGLNativeWindowType win){
XCloseDisplay(dis); XDestroyWindow(dis, win);
} }