summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-10-11 18:23:00 +0300
committerTor Lillqvist <tml@collabora.com>2015-10-11 18:26:02 +0300
commit4d8b2f8b996e2ff396a5b492125410ccc8ee2802 (patch)
tree3c878c0a45c387b9e7d61c9b7aaddd4786829f60
parent33d3d67c5916fe0f61c05be4c3396d093cc6f871 (diff)
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
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index e5514f6c50ba..2a0f72ab7ec3 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())
{