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

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Fri Aug 5 08:03:01 UTC 2016 

 vcl/opengl/areaScaleFastFragmentShader.glsl    |    2 ++
 vcl/opengl/blendedTextureFragmentShader.glsl   |    2 ++
 vcl/opengl/blendedTextureVertexShader.glsl     |    2 ++
 vcl/opengl/combinedFragmentShader.glsl         |    2 ++
 vcl/opengl/combinedTextureFragmentShader.glsl  |    2 ++
 vcl/opengl/combinedTextureVertexShader.glsl    |    2 ++
 vcl/opengl/combinedVertexShader.glsl           |    2 ++
 vcl/opengl/convolutionFragmentShader.glsl      |    2 ++
 vcl/opengl/diffTextureFragmentShader.glsl      |    2 ++
 vcl/opengl/dumbVertexShader.glsl               |    2 ++
 vcl/opengl/greyscaleFragmentShader.glsl        |    2 ++
 vcl/opengl/invert50FragmentShader.glsl         |    2 ++
 vcl/opengl/lineFragmentShader.glsl             |    2 ++
 vcl/opengl/maskFragmentShader.glsl             |    2 ++
 vcl/opengl/maskedTextureFragmentShader.glsl    |    2 ++
 vcl/opengl/maskedTextureVertexShader.glsl      |    2 ++
 vcl/opengl/replaceColorFragmentShader.glsl     |    2 ++
 vcl/opengl/solidFragmentShader.glsl            |    2 ++
 vcl/opengl/textureFragmentShader.glsl          |    2 ++
 vcl/opengl/textureVertexShader.glsl            |    2 ++
 vcl/opengl/transformedTextureVertexShader.glsl |    2 ++
 21 files changed, 42 insertions(+)

New commits:
commit f3d26af51588af441f62fb69bb7a5432845226ac
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Wed Jul 27 18:57:28 2016 +0900

    opengl: add #version to shaders - minimum 130 which is OpenGL 3.0
    
    Change-Id: I5710ce91e804641d4c997bc3d06970a5ed0cb5b1
    Reviewed-on: https://gerrit.libreoffice.org/27890
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/opengl/areaScaleFastFragmentShader.glsl b/vcl/opengl/areaScaleFastFragmentShader.glsl
index f74397b..57ad8fa 100644
--- a/vcl/opengl/areaScaleFastFragmentShader.glsl
+++ b/vcl/opengl/areaScaleFastFragmentShader.glsl
@@ -9,6 +9,8 @@
 
 /* TODO Use textureOffset for newest version of GLSL */
 
+#version 130
+
 uniform sampler2D sampler;
 uniform int xscale;
 uniform int yscale;
diff --git a/vcl/opengl/blendedTextureFragmentShader.glsl b/vcl/opengl/blendedTextureFragmentShader.glsl
index eabb652..15dfcf7 100644
--- a/vcl/opengl/blendedTextureFragmentShader.glsl
+++ b/vcl/opengl/blendedTextureFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying vec2 tex_coord;
 varying vec2 alpha_coord;
 varying vec2 mask_coord;
diff --git a/vcl/opengl/blendedTextureVertexShader.glsl b/vcl/opengl/blendedTextureVertexShader.glsl
index 64bae78..3e60d0e 100644
--- a/vcl/opengl/blendedTextureVertexShader.glsl
+++ b/vcl/opengl/blendedTextureVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec4 position;
 attribute vec2 tex_coord_in;
 attribute vec2 alpha_coord_in;
diff --git a/vcl/opengl/combinedFragmentShader.glsl b/vcl/opengl/combinedFragmentShader.glsl
index ba4fe2e..2515b17 100644
--- a/vcl/opengl/combinedFragmentShader.glsl
+++ b/vcl/opengl/combinedFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying float fade_factor; // 0->1 fade factor used for AA
 varying float multiply;
 
diff --git a/vcl/opengl/combinedTextureFragmentShader.glsl b/vcl/opengl/combinedTextureFragmentShader.glsl
index 67797be..2990de8 100644
--- a/vcl/opengl/combinedTextureFragmentShader.glsl
+++ b/vcl/opengl/combinedTextureFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying vec2 tex_coord;
 varying vec2 alpha_coord;
 varying vec2 mask_coord;
diff --git a/vcl/opengl/combinedTextureVertexShader.glsl b/vcl/opengl/combinedTextureVertexShader.glsl
index a3e4642..52d44d5 100644
--- a/vcl/opengl/combinedTextureVertexShader.glsl
+++ b/vcl/opengl/combinedTextureVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec4 position;
 attribute vec2 tex_coord_in;
 attribute vec2 mask_coord_in;
diff --git a/vcl/opengl/combinedVertexShader.glsl b/vcl/opengl/combinedVertexShader.glsl
index 3337a08..518221f 100644
--- a/vcl/opengl/combinedVertexShader.glsl
+++ b/vcl/opengl/combinedVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec2 position;
 attribute vec4 extrusion_vectors;
 #ifdef USE_VERTEX_COLORS
diff --git a/vcl/opengl/convolutionFragmentShader.glsl b/vcl/opengl/convolutionFragmentShader.glsl
index d4f7802..4b2f316 100644
--- a/vcl/opengl/convolutionFragmentShader.glsl
+++ b/vcl/opengl/convolutionFragmentShader.glsl
@@ -9,6 +9,8 @@
 
 /* TODO Use textureOffset for newest version of GLSL */
 
+#version 130
+
 uniform sampler2D sampler;
 uniform vec2 offsets[16];
 uniform float kernel[16];
diff --git a/vcl/opengl/diffTextureFragmentShader.glsl b/vcl/opengl/diffTextureFragmentShader.glsl
index af9a1dc..8c50ddf 100644
--- a/vcl/opengl/diffTextureFragmentShader.glsl
+++ b/vcl/opengl/diffTextureFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 /*precision mediump float;*/
 varying vec2 tex_coord;
 varying vec2 mask_coord;
diff --git a/vcl/opengl/dumbVertexShader.glsl b/vcl/opengl/dumbVertexShader.glsl
index deaa35b..80341b6 100644
--- a/vcl/opengl/dumbVertexShader.glsl
+++ b/vcl/opengl/dumbVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec4 position;
 uniform mat4 mvp;
 
diff --git a/vcl/opengl/greyscaleFragmentShader.glsl b/vcl/opengl/greyscaleFragmentShader.glsl
index 758109e..c37f0d5 100644
--- a/vcl/opengl/greyscaleFragmentShader.glsl
+++ b/vcl/opengl/greyscaleFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying vec2 tex_coord;
 uniform sampler2D sampler;
 
diff --git a/vcl/opengl/invert50FragmentShader.glsl b/vcl/opengl/invert50FragmentShader.glsl
index 8fac1cc..9222888 100644
--- a/vcl/opengl/invert50FragmentShader.glsl
+++ b/vcl/opengl/invert50FragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 /*precision mediump float;*/
 
 void main() {
diff --git a/vcl/opengl/lineFragmentShader.glsl b/vcl/opengl/lineFragmentShader.glsl
index a8c73d6..5a01de3 100644
--- a/vcl/opengl/lineFragmentShader.glsl
+++ b/vcl/opengl/lineFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying float fade_factor; // 0->1 fade factor used for AA
 uniform vec4 color;
 
diff --git a/vcl/opengl/maskFragmentShader.glsl b/vcl/opengl/maskFragmentShader.glsl
index 2cc7377..864869c 100644
--- a/vcl/opengl/maskFragmentShader.glsl
+++ b/vcl/opengl/maskFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying vec2 tex_coord;
 uniform sampler2D sampler;
 uniform vec4 color;
diff --git a/vcl/opengl/maskedTextureFragmentShader.glsl b/vcl/opengl/maskedTextureFragmentShader.glsl
index 75ce4ae..31c7938 100644
--- a/vcl/opengl/maskedTextureFragmentShader.glsl
+++ b/vcl/opengl/maskedTextureFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 /*precision mediump float;*/
 varying vec2 tex_coord;
 varying vec2 mask_coord;
diff --git a/vcl/opengl/maskedTextureVertexShader.glsl b/vcl/opengl/maskedTextureVertexShader.glsl
index ab225a8..6b5f327 100644
--- a/vcl/opengl/maskedTextureVertexShader.glsl
+++ b/vcl/opengl/maskedTextureVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec4 position;
 attribute vec2 tex_coord_in;
 attribute vec2 mask_coord_in;
diff --git a/vcl/opengl/replaceColorFragmentShader.glsl b/vcl/opengl/replaceColorFragmentShader.glsl
index 6e845f0..24f6008 100644
--- a/vcl/opengl/replaceColorFragmentShader.glsl
+++ b/vcl/opengl/replaceColorFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 varying vec2 tex_coord;
 uniform sampler2D sampler;
 uniform vec4 search_color;
diff --git a/vcl/opengl/solidFragmentShader.glsl b/vcl/opengl/solidFragmentShader.glsl
index af75336..b77e257 100644
--- a/vcl/opengl/solidFragmentShader.glsl
+++ b/vcl/opengl/solidFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 /*precision mediump float;*/
 
 uniform vec4 color;
diff --git a/vcl/opengl/textureFragmentShader.glsl b/vcl/opengl/textureFragmentShader.glsl
index cc95f2f..b1fedcb 100644
--- a/vcl/opengl/textureFragmentShader.glsl
+++ b/vcl/opengl/textureFragmentShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 /* precision mediump float; */
 varying vec2 tex_coord;
 uniform sampler2D sampler;
diff --git a/vcl/opengl/textureVertexShader.glsl b/vcl/opengl/textureVertexShader.glsl
index bb852f9..7fbdcf1 100644
--- a/vcl/opengl/textureVertexShader.glsl
+++ b/vcl/opengl/textureVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec4 position;
 attribute vec2 tex_coord_in;
 varying vec2 tex_coord;
diff --git a/vcl/opengl/transformedTextureVertexShader.glsl b/vcl/opengl/transformedTextureVertexShader.glsl
index 6f8d5f3..3d67f78 100644
--- a/vcl/opengl/transformedTextureVertexShader.glsl
+++ b/vcl/opengl/transformedTextureVertexShader.glsl
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#version 130
+
 attribute vec4 position;
 attribute vec2 tex_coord_in;
 attribute vec2 mask_coord_in;

More information about the Libreoffice-commits mailing list