diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-12-15 08:15:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-12-15 08:19:00 +0200 |
| commit | 014633f83e44ae8ba33087b6f38e8e253e281969 (patch) | |
| tree | c2b67cbbfa9718a4e5ab3baa901fa168c0c3cea3 /slideshow/opengl | |
| parent | e0d2acfa65d81da323cbe91e6451fca70e00bdd5 (diff) | |
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
Diffstat (limited to 'slideshow/opengl')
| -rw-r--r-- | slideshow/opengl/basicVertexShader.glsl | 2 | ||||
| -rw-r--r-- | slideshow/opengl/glitterVertexShader.glsl | 2 | ||||
| -rw-r--r-- | slideshow/opengl/reflectionVertexShader.glsl | 2 | ||||
| -rwxr-xr-x | slideshow/opengl/vortexVertexShader.glsl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/opengl/basicVertexShader.glsl b/slideshow/opengl/basicVertexShader.glsl index cd68b16a161c..e9febfff5b16 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 9fdaf2999a14..8a65a57c31c4 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 96748887c308..c7e6b5806341 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 b2f94c58bc57..f4a30a3093b6 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 |