slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 18 ++-------- 1 file changed, 4 insertions(+), 14 deletions(-)
New commits: commit 04d1ff651baac7ce0f851786064736ab7141b6f9 Author: Emmanuel Gil Peyrot <[email protected]> Date: Wed Feb 24 20:21:09 2016 +0000 slideshow: Move Vortexâ tileInfo attribute upload to the first frame (cherry-picked from the commit 9adeebadd5d1728e9abaec67aa4dd8a0c300c98f) Change-Id: Ifbc154755d43a085b78740a5a3c97ed2cbe9a905 Reviewed-on: https://gerrit.libreoffice.org/22774 Tested-by: Jenkins <[email protected]> Reviewed-by: jan iversen <[email protected]> diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 39a68bc..a70c6c5 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -1557,7 +1557,6 @@ public: } private: - virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override; virtual void finishTransition() override; virtual GLuint makeShader() const override; virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override; @@ -1575,19 +1574,6 @@ private: std::vector<GLfloat> mvTileInfo; }; -void VortexTransition::prepare( double, double, double, double, double ) -{ - glBindBuffer(GL_ARRAY_BUFFER, mnTileInfoBuffer); - CHECK_GL_ERROR(); - glEnableVertexAttribArray(mnTileInfoLocation); - CHECK_GL_ERROR(); - glVertexAttribPointer(mnTileInfoLocation, 1, GL_FLOAT, GL_FALSE, 0, nullptr); - CHECK_GL_ERROR(); - - glBindBuffer(GL_ARRAY_BUFFER, 0); - CHECK_GL_ERROR(); -} - void VortexTransition::finishTransition() { PermTextureTransition::finishTransition(); @@ -1669,6 +1655,10 @@ void VortexTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glBindBuffer(GL_ARRAY_BUFFER, mnTileInfoBuffer); CHECK_GL_ERROR(); + glEnableVertexAttribArray(mnTileInfoLocation); + CHECK_GL_ERROR(); + glVertexAttribPointer(mnTileInfoLocation, 1, GL_FLOAT, GL_FALSE, 0, nullptr); + CHECK_GL_ERROR(); glBufferData(GL_ARRAY_BUFFER, mvTileInfo.size()*sizeof(GLfloat), mvTileInfo.data(), GL_STATIC_DRAW); CHECK_GL_ERROR();
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
