From 67e5a931e2fc0061dae40eba2f08cc7d5863fe90 Mon Sep 17 00:00:00 2001 From: Timo Lotterbach Date: Wed, 3 Jul 2013 16:11:22 +0200 Subject: [PATCH] X11EglImage: fixed error logging Signed-off-by: Timo Lotterbach --- .../Renderers/Graphic/src/TextureBinders/X11EglImage.cpp | 2 +- .../Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h | 5 ++++- .../Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp index 7cd6452..85a2018 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp @@ -94,7 +94,7 @@ void X11EglImage::createClientBuffer(Surface* surface) NULL); if (!eglImage) { - LOG_DEBUG("X11EglImage", "could not allocate EGL Image for window"); + LOG_ERROR("X11EglImage", "could not allocate EGL Image for window"); } else { diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h index 9077e21..01d9fc2 100644 --- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h +++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/include/X11GLXRenderer.h @@ -36,7 +36,7 @@ public: uint getNumberOfHardwareLayers(uint screenID); uint* getScreenResolution(uint screenID); uint* getScreenIDs(uint* length); - bool start(int, int, const char*); + bool start(int, int, const char*, int); void stop(); void signalWindowSystemRedraw(); @@ -46,6 +46,9 @@ public: virtual bool getOptimizationMode(OptimizationType id, OptimizationModeType* mode); virtual bool setOptimizationMode(OptimizationType id, OptimizationModeType mode); + // from PluginBase + virtual int getIterationCounter(); + private: X11WindowSystem* m_pWindowSystem; GLXGraphicsystem* m_pGraphicSystem; diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp index 7b8b118..a3b232b 100644 --- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp +++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp @@ -35,7 +35,7 @@ X11GLXRenderer::X11GLXRenderer(ICommandExecutor& executor, Configuration& config { } -bool X11GLXRenderer::start(int width, int height, const char* displayname) +bool X11GLXRenderer::start(int width, int height, const char* displayname, int maxIterationDurationInMS) { bool result = false; ITextureBinder *binder = NULL; @@ -78,7 +78,7 @@ bool X11GLXRenderer::start(int width, int height, const char* displayname) if (binder != NULL) { m_pGraphicSystem->setTextureBinder(binder); - result = m_pWindowSystem->start(); + result = m_pWindowSystem->start(maxIterationDurationInMS); } } } @@ -165,4 +165,9 @@ bool X11GLXRenderer::setOptimizationMode(OptimizationType id, OptimizationModeTy return m_pGraphicSystem->setOptimizationMode(id, (unsigned int)mode); } +int X11GLXRenderer::getIterationCounter() +{ + return m_pWindowSystem->getIterationCounter(); +} + DECLARE_LAYERMANAGEMENT_PLUGIN(X11GLXRenderer) -- 2.7.4