[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/opengl/OpenGLHelper.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 4d8b2f8b996e2ff396a5b492125410ccc8ee2802
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Oct 11 18:23:00 2015 +0300

    Moggi thinks this mutex is unnecessary and I trust him
    
    "Is the mutex really necessary? Normally outside of the chart OpenGL
    only the thread that has taken the SolarMutex should access the OpenGL
    code. In general we have bigger problems if several threads start
    rendering in parallel."
    
    Change-Id: I5f8fa8c771d5e2e0df4cfe903b15d00e5cc162b1

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index e5514f6..2a0f72a 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -11,7 +11,6 @@
 #include <vcl/opengl/OpenGLHelper.hxx>
 
 #include <osl/file.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/digest.h>
 #include <rtl/strbuf.hxx>
@@ -90,8 +89,6 @@ OString loadShader(const OUString& rFilename)
 OString& getShaderSource(const OUString& rFilename)
 {
     static std::unordered_map<OUString, OString, OUStringHash> aMap;
-    static osl::Mutex aMutex;
-    osl::MutexGuard aGuard(aMutex);
 
     if (aMap.find(rFilename) == aMap.end())
     {