a6b033d19e
This is a workaround to a driver bug on Intel/Linux, when destroying a subwindow do not close the X display connection, keep it for the next call to createSubWindow. It happens that the intel/linux driver caches the display connection for each window ID and use it during swap or something similar. Using the same display connection for all subwindows workaround the problem. Also added a wait loop to wait until the window becomes mapped instead of just calling XSync after calling XMapWindow. This is more accurate and make sure we do not miss the first window refresh. Change-Id: I63c69d736df433666a8c79d71127afe72776e89f
49 lines
1.7 KiB
C++
49 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#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,
|
|
EGLNativeDisplayType* display_out,
|
|
int x, int y,int width, int height){
|
|
|
|
// 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);
|
|
XEvent e;
|
|
XIfEvent(*display_out, &e, WaitForMapNotify, (char *)win);
|
|
return win;
|
|
}
|
|
|
|
void destroySubWindow(EGLNativeDisplayType dis,EGLNativeWindowType win){
|
|
XDestroyWindow(dis, win);
|
|
}
|