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

[Chris Sherlock]

 vcl/opengl/areaScaleFragmentShader.glsl |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 254ecc7c7d72310a1256bb7c266188ada0eb1c2a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Jan 22 11:17:03 2015 +1100

    Apply GLSL patch for areaScaleFragmentShader
    
    Thanks to Lubos Lunak
    
    Change-Id: I9bb72e1a5b11102963481dac7c11ab4a9fe90b0b
    Signed-off-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/14095

diff --git a/vcl/opengl/areaScaleFragmentShader.glsl b/vcl/opengl/areaScaleFragmentShader.glsl
index 03fbe69..498b0b5 100644
--- a/vcl/opengl/areaScaleFragmentShader.glsl
+++ b/vcl/opengl/areaScaleFragmentShader.glsl
@@ -7,6 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 120
+#if __VERSION__ < 130
+int min( int a, int b ) { return a < b ? a : b; }
+float min( float a, float b ) { return a < b ? a : b; }
+#endif
+
 /* TODO Use textureOffset for newest version of GLSL */
 
 uniform sampler2D sampler;