[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/opengl vcl/source

[Markus Mohrhard]

 vcl/opengl/maskedTextureFragmentShader.glsl |    2 +-
 vcl/source/opengl/OpenGLHelper.cxx          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5a0b4258f8974acc5c1904377c6d33ba60155e3f
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Nov 7 01:04:42 2014 +0100

    improve log message when shader compilation fails
    
    Change-Id: Ic437302e79d7a192f31f60a674fcfdb38f981d35

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index d3da56d..e30d607 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -86,7 +86,7 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString
             SAL_WARN("vcl.opengl", "vertex shader compile for " << rVertexShaderName << " failed : " << &VertexShaderErrorMessage[0]);
         }
         else
-            SAL_WARN("vcl.opengl", "vertex shader compile failed without error log");
+            SAL_WARN("vcl.opengl", "vertex shader: " << rVertexShaderName << " compile failed without error log");
 
         return 0;
     }
commit a844a60faa3a396b0494a661ac3210a3bdee4a46
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Nov 7 01:04:21 2014 +0100

    make shader compile for now
    
    Change-Id: I4613b2496e72fc193dc0b653fb2c8982819f6f1c

diff --git a/vcl/opengl/maskedTextureFragmentShader.glsl b/vcl/opengl/maskedTextureFragmentShader.glsl
index a961f12..8f8148a 100644
--- a/vcl/opengl/maskedTextureFragmentShader.glsl
+++ b/vcl/opengl/maskedTextureFragmentShader.glsl
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-precision mediump float;
+/*precision mediump float;*/
 varying vec2 tex_coord;
 uniform sampler2D sampler;
 uniform sampler2D mask;