From 04e2caeba5e346fb5d415d633b1956ef24c41037 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 19 Nov 2015 17:18:54 +0000 Subject: slideshow: Use gl_ModelViewProjectionMatrix in vertex shaders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ftransform() is deprecated, and we shouldn’t do an extraneous multiplication to obtain the two matrices together. Change-Id: Iaa16c106b8b702468f7be643a812107f0967acdd --- slideshow/opengl/basicVertexShader.glsl | 2 +- slideshow/opengl/vortexVertexShader.glsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'slideshow/opengl') diff --git a/slideshow/opengl/basicVertexShader.glsl b/slideshow/opengl/basicVertexShader.glsl index da8355465f9d..bd26c1b52115 100644 --- a/slideshow/opengl/basicVertexShader.glsl +++ b/slideshow/opengl/basicVertexShader.glsl @@ -32,7 +32,7 @@ varying vec2 v_texturePosition; void main( void ) { - gl_Position = ftransform(); + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; v_texturePosition = gl_MultiTexCoord0.xy; } diff --git a/slideshow/opengl/vortexVertexShader.glsl b/slideshow/opengl/vortexVertexShader.glsl index 07a00f2aa534..ff86546d24c6 100755 --- a/slideshow/opengl/vortexVertexShader.glsl +++ b/slideshow/opengl/vortexVertexShader.glsl @@ -96,7 +96,7 @@ void main( void ) v_textureSelect = 1; } - gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * v; + gl_Position = gl_ModelViewProjectionMatrix * v; v_texturePosition = gl_MultiTexCoord0.xy; } -- cgit v1.2.3