Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: Ie39f778967a81af072e60194987d6e3978afb45e

diff --git a/framework/platform/X11/tcuX11Xcb.cpp b/framework/platform/X11/tcuX11Xcb.cpp
index 41dbddb..c224c75 100644 (file)
--- a/framework/platform/X11/tcuX11Xcb.cpp
+++ b/framework/platform/X11/tcuX11Xcb.cpp
@@ -150,8 +150,12 @@ void XcbWindow::setDimensions (int width, int height)
                {
                        if (XCB_PROPERTY_NOTIFY == (event->response_type & ~0x80))
                        {
-                               deFree(event);
-                               break;
+                               const xcb_property_notify_event_t* pnEvent = (xcb_property_notify_event_t*)event;
+                               if (pnEvent->atom == XCB_ATOM_RESOLUTION)
+                               {
+                                       deFree(event);
+                                       break;
+                               }
                        }
                        deFree(event);
                }