diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2015-01-22 11:17:03 +1100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-01-28 14:10:56 +0000 |
commit | e471f3861bda5575742eac3f1d9747108e5e8e7a (patch) | |
tree | 5efe7447270087bd47fa90134b3e2c112f18bbca /vcl | |
parent | db684961b9cfc97d4151c9bee0e58e4f6c9672f3 (diff) |
Apply GLSL patch for areaScaleFragmentShader
Thanks to Lubos Lunak
Change-Id: I9bb72e1a5b11102963481dac7c11ab4a9fe90b0b
Signed-off-by: Chris Sherlock <chris.sherlock79@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/14095
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/opengl/areaScaleFragmentShader.glsl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/opengl/areaScaleFragmentShader.glsl b/vcl/opengl/areaScaleFragmentShader.glsl index 03fbe691c65b..498b0b53ec4b 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; |