[Libreoffice-commits] core.git: Branch 'feature/opengl-canvas-rework' - canvas/opengl canvas/Package_opengl.mk

[Michael Jaumann]

 canvas/Package_opengl.mk                        |    1 +
 canvas/opengl/constantFragmentShader.glsl       |    2 +-
 canvas/opengl/texVertexShader.glsl              |    3 +++
 canvas/opengl/textFragmentShader.glsl           |    4 ++--
 canvas/opengl/textManipulatingVertexShader.glsl |    3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ea88a49e33cd9182eca412d1198e3cdf548bab64
Author: Michael Jaumann <meta_dev at yahoo.com>
Date:   Thu Nov 6 14:31:25 2014 +0000

    fixed some problems with glsl version
    
    Change-Id: Id1cf9382680ae225c205535dbafd06abce269eaf

diff --git a/canvas/Package_opengl.mk b/canvas/Package_opengl.mk
index a92fffc..13c6cb3 100644
--- a/canvas/Package_opengl.mk
+++ b/canvas/Package_opengl.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Package_add_files,canvas_opengl_shader,$(LIBO_ETC_FOLDER)/openg
         simpleVertexShader.glsl \
         textFragmentShader.glsl \
         textManipulatingVertexShader.glsl \
+        texVertexShader.glsl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/canvas/opengl/constantFragmentShader.glsl b/canvas/opengl/constantFragmentShader.glsl
index 6deb08f..67b0a9c 100644
--- a/canvas/opengl/constantFragmentShader.glsl
+++ b/canvas/opengl/constantFragmentShader.glsl
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#version 120 core
+#version 120 
 
 uniform vec4 constantColor;
 
diff --git a/canvas/opengl/texVertexShader.glsl b/canvas/opengl/texVertexShader.glsl
index c359f11..aadf0de 100644
--- a/canvas/opengl/texVertexShader.glsl
+++ b/canvas/opengl/texVertexShader.glsl
@@ -6,6 +6,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
+#version 120
+
 attribute vec2 vPosition;
 uniform mat4 MVP;
 
diff --git a/canvas/opengl/textFragmentShader.glsl b/canvas/opengl/textFragmentShader.glsl
index 32a0423e..b81b07a 100644
--- a/canvas/opengl/textFragmentShader.glsl
+++ b/canvas/opengl/textFragmentShader.glsl
@@ -7,12 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#version 120 core
+#version 120
 
 uniform sampler2D TextTex;	
 uniform vec4 colorTex;
 //Texture Coordinates
-varying vec2 textC	oords;
+varying vec2 textCoords;
 
 void main()
 {
diff --git a/canvas/opengl/textManipulatingVertexShader.glsl b/canvas/opengl/textManipulatingVertexShader.glsl
index dfe10d2..172fc18 100644
--- a/canvas/opengl/textManipulatingVertexShader.glsl
+++ b/canvas/opengl/textManipulatingVertexShader.glsl
@@ -6,6 +6,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
+
+#version 120
+
 attribute vec2 vPosition;
 varying vec2 textCoords;
 uniform vec2 texCord;