diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2015-11-19 17:18:54 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-11-19 19:21:46 +0200 |
| commit | 04e2caeba5e346fb5d415d633b1956ef24c41037 (patch) | |
| tree | 872a259389eb44e8d256507c303ebb8734bd3d0d /slideshow/opengl | |
| parent | slideshow: Always enable normals, there is no case where they are empty (diff) | |
| download | core-04e2caeba5e346fb5d415d633b1956ef24c41037.tar.gz core-04e2caeba5e346fb5d415d633b1956ef24c41037.zip | |
slideshow: Use gl_ModelViewProjectionMatrix in vertex shaders
ftransform() is deprecated, and we shouldnât do an extraneous
multiplication to obtain the two matrices together.
Change-Id: Iaa16c106b8b702468f7be643a812107f0967acdd
Diffstat (limited to 'slideshow/opengl')
| -rw-r--r-- | slideshow/opengl/basicVertexShader.glsl | 2 | ||||
| -rwxr-xr-x | slideshow/opengl/vortexVertexShader.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
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; } |