X11WindowSystem: Introducing skip of DamageEvents for resized surfaces

- If a surfaces is resized, we got invalid content, this causes
  flickering on the composition side.

- To guarantee that a system will not flicker during resize, an new
   mechanism is added for surfaces which causes a synchronized composition.

- It is only considered if the surface is set to synchronized

Signed-off-by: Michael Schuldt <michael.schuldt@bmw.de>

diff --git a/LayerManagerBase/include/GraphicalSurface.h b/LayerManagerBase/include/GraphicalSurface.h
index cfba12a..dd070a5 100644 (file)
--- a/LayerManagerBase/include/GraphicalSurface.h
+++ b/LayerManagerBase/include/GraphicalSurface.h
@@ -102,6 +102,7 @@ public:
 
     int OriginalSourceWidth;
     int OriginalSourceHeight;
+    bool m_surfaceResized;
 
 private:
     OrientationType m_orientation; // Rotation of the graphical content
@@ -114,6 +115,7 @@ inline GraphicalSurface::GraphicalSurface(ObjectType type, int creatorPid)
 : GraphicalObject(type, 1.0, false, creatorPid)
 , OriginalSourceWidth(0)
 , OriginalSourceHeight(0)
+, m_surfaceResized(false)
 , m_orientation(Zero)
 , m_sourceViewport(0, 0, 0, 0)
 , m_destinationViewport(0, 0, 0, 0)
@@ -124,6 +126,7 @@ inline GraphicalSurface::GraphicalSurface(int externalId, ObjectType type, int c
 : GraphicalObject(externalId, type, 1.0, false, creatorPid)
 , OriginalSourceWidth(0)
 , OriginalSourceHeight(0)
+, m_surfaceResized(false)
 , m_orientation(Zero)
 , m_sourceViewport(0, 0, 0, 0)
 , m_destinationViewport(0, 0, 0, 0)

diff --git a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
index ba40aa2..3589346 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
+++ b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/X11WindowSystem.h
@@ -25,6 +25,7 @@
 #include "Surface.h"
 #include "PlatformSurfaces/XPlatformSurface.h"
 #include <X11/Xutil.h>
+#include <X11/extensions/Xfixes.h>
 #include "Log.h"
 #include "ScreenShotType.h"
 
@@ -94,6 +95,7 @@ private:
 protected:
     Display* x11Display;
 
+    XserverRegion x11DamageRegion;
     pthread_t renderThread;
     //void setDisplayMode();
     int windowWidth;

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
index 1dc6014..88a53b0 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
@@ -158,6 +158,7 @@ bool X11WindowSystem::checkForDamageExtension()
         return false;
     }
     XDamageQueryVersion(x11Display, &damage_major, &damage_minor);
+    x11DamageRegion = XFixesCreateRegion(x11Display, 0, 0);
     LOG_DEBUG("X11WindowSystem", "Found damage extension: damage opcode: " << damage_opcode);
     LOG_DEBUG("X11WindowSystem", "damage_major: " << damage_major);
     LOG_DEBUG("X11WindowSystem", "damage_minor: " << damage_minor);
@@ -286,6 +287,8 @@ void X11WindowSystem::configureSurfaceWindow(Window window)
         surface->OriginalSourceHeight = winHeight;
         surface->OriginalSourceWidth = winWidth;
 
+        surface->damaged = false; // Waiting for damage event to get updated content
+        surface->m_surfaceResized = true /*surface->synchronized*/;
         LOG_DEBUG("X11WindowSystem", "Done Updating window " << window);
     }
 }
@@ -858,8 +861,15 @@ init_complete:
             checkRedraw = true;
             break;
         case Expose:
-            LOG_DEBUG("X11WindowSystem", "Expose Event");
-            checkRedraw = true;
+            if (event.xexpose.window == this->CompositorWindow)
+            {
+                checkRedraw = true;
+                LOG_DEBUG("X11WindowSystem", "Expose Event triggered by internal Redraw");
+            }
+            else
+            {
+                LOG_DEBUG("X11WindowSystem", "Expose Event triggered by external Application");
+            }
             break;
         case MapNotify:
             LOG_DEBUG("X11WindowSystem", "Map Event");
@@ -904,7 +914,7 @@ init_complete:
         default:
             if (event.type == this->damage_event + XDamageNotify)
             {
-                XDamageSubtract(this->x11Display, ((XDamageNotifyEvent*)(&event))->damage, None, None);
+                XDamageSubtract(this->x11Display, ((XDamageNotifyEvent*)(&event))->damage, None, x11DamageRegion);
                 Surface* currentSurface = this->getSurfaceForWindow(((XDamageNotifyEvent*)(&event))->drawable);
                 if (currentSurface == NULL)
                 {
@@ -915,14 +925,34 @@ init_complete:
                 {
                     if (currentSurface->platform != NULL)
                     {
+                        XRectangle* rectangles;
+                        XRectangle bounds;
+                        int numberRects;
                         /* Enable Rendering for Surface, after damage Notification was send successfully */
                         /* This will ensure, that the content is not dirty */
                         ((XPlatformSurface *)(currentSurface->platform))->enableRendering();
+                        rectangles = XFixesFetchRegionAndBounds(this->x11Display, x11DamageRegion, &numberRects, &bounds);
+                        if (currentSurface->OriginalSourceWidth != bounds.width || currentSurface->OriginalSourceHeight != bounds.height)
+                        {
+                            LOG_DEBUG("X11WindowSystem", "Damaged Bounds differs from size : [ " << bounds.x << ", " << bounds.y <<
+                                                                ", " << bounds.width << ", " << bounds.height << " ]");
+                            currentSurface->m_surfaceResized = true /*currentSurface->synchronized*/;
+                        }
+                        XFree(rectangles);
                     }
                 }
-                currentSurface->damaged = true;
-                currentSurface->updateCounter++;
-                checkRedraw = true;
+                /* Ignore Damage Events after Resize, the content can be invalid */
+                if (!currentSurface->m_surfaceResized)
+                {
+                    currentSurface->damaged = true;
+                    currentSurface->updateCounter++;
+                    checkRedraw = true;
+                }
+                else
+                {
+                    LOG_DEBUG("X11WindowSystem", "Skipping Damage Event which was triggered after ConfigureNotify");
+                    currentSurface->m_surfaceResized = false;
+                }
             }
             break;
         }
@@ -1041,6 +1071,7 @@ void X11WindowSystem::cleanup()
     {
         Window root = RootWindow(x11Display, DefaultScreen(x11Display));
         XCompositeUnredirectSubwindows(x11Display, root, CompositeRedirectManual);
+        XFixesDestroyRegion(x11Display, x11DamageRegion);
         XDestroyWindow(x11Display, CompositorWindow);
     }
 
@@ -1076,12 +1107,6 @@ bool X11WindowSystem::init(BaseGraphicSystem<Display*, Window>* base)
     mThreadId = renderThread;
 
     pthread_cond_wait(&init_condition, &init_lock);
-/*  while (!m_initialized)
-    {
-        usleep(1000); // TODO
-        LOG_DEBUG("X11WindowSystem","Waiting start complete " << m_initialized);
-    }
-*/
     pthread_mutex_unlock(&init_lock);
     LOG_INFO("X11WindowSystem", "Initialization complete success :" << m_success);
     return m_success;

diff --git a/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLESv2/CMakeLists.txt b/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLESv2/CMakeLists.txt
index a2be736..08f3b5b 100644 (file)
--- a/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLESv2/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLESv2/CMakeLists.txt
@@ -64,6 +64,7 @@ set(LIBS
     ${X11_X11_LIB}
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
+    ${X11_Xfixes_LIB}
     ${EGL_LIBRARY}
     ${GLESv2_LIBRARIES}
 )

diff --git a/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLX/CMakeLists.txt b/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLX/CMakeLists.txt
index efead22..b7d925c 100644 (file)
--- a/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLX/CMakeLists.txt
+++ b/LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLX/CMakeLists.txt
@@ -60,6 +60,7 @@ set(LIBS
     ${X11_X11_LIB}
     ${X11_Xcomposite_LIB}
     ${X11_Xdamage_LIB}
+    ${X11_Xfixes_LIB}
     ${GLX_LIBRARIES}
     LayerManagerUtils
     LayerManagerBase