From 1a9b62dc661a26c02db34ab5075b4e209a70b196 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>
Date: Wed, 24 Feb 2016 20:21:10 +0000
Subject: slideshow: Only use texture() in GLSL 1.50, fixes Intel on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 slideshow/opengl/vortexVertexShader.glsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'slideshow/opengl/vortexVertexShader.glsl')

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)
-- 
cgit