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

[Tor Lillqvist]

 slideshow/opengl/basicVertexShader.glsl      |    2 +-
 slideshow/opengl/glitterVertexShader.glsl    |    2 +-
 slideshow/opengl/reflectionVertexShader.glsl |    2 +-
 slideshow/opengl/vortexVertexShader.glsl     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 014633f83e44ae8ba33087b6f38e8e253e281969
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 15 08:15:37 2015 +0200

    Use #version 140 to get inverse()
    
    The Linux GLSL imlementation is very loose in its interpretation of
    standards, it seems. (I am not surprised.) Not so on Windows, at least
    with AMD drivers. The inverse() function (for float matririces) is
    present only starting from GLSL 1.40. Bump the #version directive
    accordingly. (See
    https://www.opengl.org/sdk/docs/man/html/inverse.xhtml)
    
    To get this to work again on OS X will be a further challenge. There a
    'legacy' context only has GLSL 1.20. But the intent is to move this
    code in the direction of using 'core' contexts anyway.
    
    Change-Id: I572dc7cc30f90321b233fbfd857455dc01761a7c

diff --git a/slideshow/opengl/basicVertexShader.glsl b/slideshow/opengl/basicVertexShader.glsl
index cd68b16..e9febff 100644
--- a/slideshow/opengl/basicVertexShader.glsl
+++ b/slideshow/opengl/basicVertexShader.glsl
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#version 120
+#version 140
 
 attribute vec3 a_position;
 attribute vec3 a_normal;
diff --git a/slideshow/opengl/glitterVertexShader.glsl b/slideshow/opengl/glitterVertexShader.glsl
index 9fdaf29..8a65a57 100644
--- a/slideshow/opengl/glitterVertexShader.glsl
+++ b/slideshow/opengl/glitterVertexShader.glsl
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#version 130
+#version 140
 
 #define M_PI 3.1415926535897932384626433832795
 
diff --git a/slideshow/opengl/reflectionVertexShader.glsl b/slideshow/opengl/reflectionVertexShader.glsl
index 9674888..c7e6b58 100644
--- a/slideshow/opengl/reflectionVertexShader.glsl
+++ b/slideshow/opengl/reflectionVertexShader.glsl
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#version 130
+#version 140
 
 attribute vec3 a_position;
 attribute vec3 a_normal;
diff --git a/slideshow/opengl/vortexVertexShader.glsl b/slideshow/opengl/vortexVertexShader.glsl
index b2f94c5..f4a30a3 100755
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#version 120
+#version 140
 
 #define M_PI 3.1415926535897932384626433832795