slideshow/opengl/glitterVertexShader.glsl | 1 -
slideshow/source/engine/opengl/TransitionImpl.cxx | 6 ------
2 files changed, 7 deletions(-)
New commits:
commit d5c5732ada2f9f616e26ef514676adee2245c5e5
Author: Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
AuthorDate: Wed May 29 18:29:18 2024 +0530
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Jun 3 15:18:08 2024 +0200
Remove unused 'numTiles' from glitter vertex shader
The 'numTiles' variable is not being used in the vertex shader. To test
this PR, apply the Glitter transition. If it works as expected, then the change
is successful.
Signed-off-by: Javiya Vivekkumar Dineshbhai <vivek.jav...@collabora.com>
Change-Id: Ia1f833e6009b1f8c774329945ba260d20b8c9f64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168222
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/slideshow/opengl/glitterVertexShader.glsl
b/slideshow/opengl/glitterVertexShader.glsl
index 00ae568ac672..ecf0cbb13124 100644
--- a/slideshow/opengl/glitterVertexShader.glsl
+++ b/slideshow/opengl/glitterVertexShader.glsl
@@ -25,7 +25,6 @@ varying vec3 v_normal;
attribute vec3 center;
uniform float time;
-uniform ivec2 numTiles;
uniform sampler2D permTexture;
varying float angle;
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 758b4a7d4d73..1e9c661d6c09 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -1997,12 +1997,6 @@ void GlitterTransition::prepareTransition( sal_Int32
glLeavingSlideTex, sal_Int3
PermTextureTransition::prepareTransition( glLeavingSlideTex,
glEnteringSlideTex, pContext );
CHECK_GL_ERROR();
- GLint nNumTilesLocation = glGetUniformLocation(m_nProgramObject,
"numTiles");
- if (nNumTilesLocation != -1) {
- glUniform2iv(nNumTilesLocation, 1, glm::value_ptr(glm::ivec2(41, 41 *
4 / 3)));
- CHECK_GL_ERROR();
- }
-
glGenBuffers(1, &maBuffer);
glBindBuffer(GL_ARRAY_BUFFER, maBuffer);
