[Libreoffice-commits] core.git: Branch 'feature/fixes36' - vcl/inc vcl/source

[Jan Holesovsky]

 vcl/inc/opengl/watchdog.hxx        |    1 +
 vcl/source/opengl/OpenGLHelper.cxx |   10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 86adf461d56dc46056c4fdf31d77d4b509076ca4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 20 00:16:10 2016 +0200

    tdf#102295: relax timeout timings for the GL watchdog
    
    Some OS/GPU combinations need more relaxed watchdog timeout timings
    as the shader compilation takes too long to complete.
    
    Change-Id: Ifd9ff7ecfa4b004d5411d6d364dd01a389a3fcec
    (cherry picked from commit e5c3c69423c0f32bf4bee147936e58ba4d3be181)

diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index ce97064..ced3cf2 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -22,6 +22,7 @@ struct WatchdogTimings
 
     int mnMode;
 
+    /// delays to take various actions in 1/4 of a second increments.
     std::vector<int> maDisableEntries;
     std::vector<int> maAbortAfter;
 
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 38317e5..f36b4da 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -827,10 +827,10 @@ void WatchdogTimings::relax()
 {
     osl::MutexGuard g(maMutex);
 
-    maDisableEntries[0] = 20; /*  5s */
-    maDisableEntries[1] = 60; /* 15s */
+    maDisableEntries[0] = 180; /* 45s */
+    maDisableEntries[1] = 180; /* 45s */
 
-    maAbortAfter[0] = 40;  /* 10s */
+    maAbortAfter[0] = 240; /* 60s */
     maAbortAfter[1] = 240; /* 60s */
 }
 
@@ -841,10 +841,6 @@ OpenGLWatchdogThread::OpenGLWatchdogThread()
 
 void OpenGLWatchdogThread::execute()
 {
-    // delays to take various actions in 1/4 of a second increments.
-    static const int nDisableEntries[2] = { 6 /* 1.5s */, 20 /* 5s */ };
-    static const int nAbortAfter[2]     = { 20 /* 10s */, 120 /* 30s */ };
-
     int nUnchanged = 0; // how many unchanged nEnters
     TimeValue aQuarterSecond(0, 1000*1000*1000*0.25);
     bool bAbortFired = false;