[Libreoffice-commits] core.git: 2 commits - external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk                   |    1 
 external/libgltf/pathces/fix_rendering_of_resized_model.patch |   71 ----------
 external/libgltf/pathces/missing_include.patch                |   11 +
 3 files changed, 12 insertions(+), 71 deletions(-)

New commits:
commit 841d50ec234e71e8e89d0e9135e2002f35fc42fa
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Tue Aug 5 11:47:15 2014 +0200

    libgltf: remove obsolete patch
    
    Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7

diff --git a/external/libgltf/pathces/fix_rendering_of_resized_model.patch b/external/libgltf/pathces/fix_rendering_of_resized_model.patch
deleted file mode 100644
index 57af9f9..0000000
--- a/external/libgltf/pathces/fix_rendering_of_resized_model.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
---- libgltf.org/src/RenderScene.cpp	2014-07-15 17:33:12.615059856 +0200
-+++ libgltf/src/RenderScene.cpp	2014-07-15 22:24:20.862307666 +0200
-@@ -639,7 +639,7 @@
-     , pScene(0)
-     , mLoadJson()
-     , mBindBufferMap()
--    , viewport()
-+    , mCurrentViewport()
-     , fbo()
-     , mEnableTransparency(false)
-     , mEnableRotation(false)
-@@ -1555,10 +1555,9 @@
-         pFPSCounter->timeStamp();
-     }
- #endif
--    viewport = *((glTFViewport*)lpParam);
-     {
-         TRACE_TIME;
--        status = initSSAAFrameBuf(&viewport);
-+        status = initSSAAFrameBuf(((glTFViewport*)lpParam));
-         if (LIBGLTF_SUCCESS != status)
-             return status;
-     }
-@@ -1569,6 +1568,15 @@
- {
-     if (0 == pViewport->width)
-         return LIBGLTF_INVALID_SIZE;
-+
-+    // When viewport changes we need to release fbo and create a new one
-+    if( mCurrentViewport.x != pViewport->x || mCurrentViewport.y != pViewport->y ||
-+        mCurrentViewport.width != pViewport->width || mCurrentViewport.height != pViewport->height )
-+    {
-+        fbo.releaseFbo();
-+        mCurrentViewport = *pViewport;
-+    }
-+
- #if DEFAULT_VIEW
-     unsigned int width  = SSAA * DEFAULT_VIEW;
-     unsigned int height = (SSAA * DEFAULT_VIEW *
-@@ -1730,14 +1738,14 @@
- #if ENABLE_FPS
-     if (0 != pFPSCounter)
-     {
--        pFPSCounter->printFPS(&viewport);
-+        pFPSCounter->printFPS(&mCurrentViewport);
-     }
- #endif
- 
-     {
-         TRACE_TIME;
--        glViewport(viewport.x, viewport.y,
--                   viewport.width, viewport.height);
-+        glViewport(mCurrentViewport.x, mCurrentViewport.y,
-+                   mCurrentViewport.width, mCurrentViewport.height);
-         glBindFramebuffer(GL_FRAMEBUFFER, 0);
-         fbo.renderFboTexture();
-     }
-Only in libgltf/src: RenderScene.cpp~
-diff -ur libgltf.org/src/RenderScene.h libgltf/src/RenderScene.h
---- libgltf.org/src/RenderScene.h	2014-07-15 17:33:12.615059856 +0200
-+++ libgltf/src/RenderScene.h	2014-07-15 22:18:01.306324010 +0200
-@@ -349,7 +349,7 @@
-     std::map<std::string, BindBufferInfo> mBindBufferMap;
- 
-     static ShaderProgram mShaderProgram;
--    glTFViewport viewport;
-+    glTFViewport mCurrentViewport;
-     RenderWithFBO fbo;
- 
-     bool mEnableTransparency;
commit d085bba9139d882e191b46ee8056d364e7526f88
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Tue Aug 5 11:45:35 2014 +0200

    libgltf: missing <cstdio> include
    
    Change-Id: I69ac77f954434c080a70ae9833ee60a99d7f9eef

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 176c1d1..3b27c2a 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
+	external/libgltf/pathces/missing_include.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/pathces/missing_include.patch b/external/libgltf/pathces/missing_include.patch
new file mode 100644
index 0000000..8b05224
--- /dev/null
+++ b/external/libgltf/pathces/missing_include.patch
@@ -0,0 +1,11 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp	2014-08-05 11:40:30.387537876 +0200
++++ libgltf/src/Shaders.cpp	2014-08-05 11:41:13.887536123 +0200
+@@ -10,6 +10,7 @@
+ #include "Shaders.h"
+ 
+ #include <GL/glew.h>
++#include <cstdio>
+ 
+ namespace libgltf
+ {