diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2016-02-24 20:21:10 +0000 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-02-25 11:13:41 +0000 |
| commit | 1a9b62dc661a26c02db34ab5075b4e209a70b196 (patch) | |
| tree | 8ceed445cf517fb16653ca9b841e1e36b2bb23ae /slideshow/opengl/vortexVertexShader.glsl | |
| parent | db9fe1ea4a1e0e33dece63652c2b076fb323ec63 (diff) | |
slideshow: Only use texture() in GLSL 1.50, fixes Intel on Windows
texture2D() is still available, but not in the geometry stage, so
better be consistent everywhere.
Change-Id: I86bf1921713bcbf32946190525401bfcc633a69f
Reviewed-on: https://gerrit.libreoffice.org/22468
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'slideshow/opengl/vortexVertexShader.glsl')
| -rw-r--r-- | slideshow/opengl/vortexVertexShader.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/opengl/vortexVertexShader.glsl b/slideshow/opengl/vortexVertexShader.glsl index 5c6fe23a3f15..8d1a67d3d120 100644 --- a/slideshow/opengl/vortexVertexShader.glsl +++ b/slideshow/opengl/vortexVertexShader.glsl @@ -39,7 +39,7 @@ out float endTime; float snoise(vec2 p) { - return texture2D(permTexture, p).r; + return texture(permTexture, p).r; } mat4 identityMatrix(void) |