From 1554fc9611e44d55eacc577bfed51d0f9c1c3a25 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Tue, 20 May 2014 22:00:19 +0200
Subject: libgltf: Updated version.

Change-Id: Ia394ff00421f495757cc2ce55e7b91bfebe715eb
---
 external/libgltf/UnpackedTarball_libgltf.mk        |   2 +-
 external/libgltf/patches/disable_fps.patch         |  31 ------
 .../libgltf/patches/disable_fps_and_timer.patch    | 124 +++++++++++++++++++++
 3 files changed, 125 insertions(+), 32 deletions(-)
 delete mode 100644 external/libgltf/patches/disable_fps.patch
 create mode 100644 external/libgltf/patches/disable_fps_and_timer.patch

(limited to 'external')

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 3c96babd46af..e919c71dcde7 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/include_path_glew.patch \
 	external/libgltf/patches/include_path_freetype.patch \
-	external/libgltf/patches/disable_fps.patch \
+	external/libgltf/patches/disable_fps_and_timer.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/disable_fps.patch b/external/libgltf/patches/disable_fps.patch
deleted file mode 100644
index bc64d90cd462..000000000000
--- a/external/libgltf/patches/disable_fps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git libgltf/src/FPSCounter.h libgltf/src/FPSCounter.h
-index c6c4279..66f7e2b 100644
---- libgltf/src/FPSCounter.h
-+++ libgltf/src/FPSCounter.h
-@@ -7,6 +7,11 @@
-  */
- #ifndef FPSCOUNTER_H
- #define FPSCOUNTER_H
-+
-+#define ENABLE_FPS    0
-+
-+#if ENABLE_FPS
-+
- #include "time.h"
- #include "Font.h"
- #include "Shaders.h"
-@@ -17,7 +22,6 @@
- 
- #define WRITEFPS2FILE 1
- #define TIMETHRESHOLD 30
--#define ENABLE_FPS    1
- #define FPS_FILE      "./FPSCounter.txt"
- #if WRITEFPS2FILE
- #include <iostream>
-@@ -136,4 +140,6 @@ private:
- #endif
- };
- 
-+#endif // ENABLE_FPS
-+
- #endif
diff --git a/external/libgltf/patches/disable_fps_and_timer.patch b/external/libgltf/patches/disable_fps_and_timer.patch
new file mode 100644
index 000000000000..c5d5eb289186
--- /dev/null
+++ b/external/libgltf/patches/disable_fps_and_timer.patch
@@ -0,0 +1,124 @@
+diff --git libgltf/src/RenderScene.cpp libgltf/src/RenderScene.cpp
+index 88c5c9a..6639572 100644
+--- libgltf/src/RenderScene.cpp
++++ libgltf/src/RenderScene.cpp
+@@ -383,7 +383,9 @@ void RenderWithFBO::releaseFbo()
+ 
+ 
+ CPhysicalCamera* RenderScene::sCamera = NULL;
++#if ENABLE_FPS
+ FPSCounter* RenderScene::pFPSCounter = NULL;
++#endif
+ ShaderProgram RenderScene::mShaderProgram = ShaderProgram();
+ 
+ RenderScene::RenderScene()
+@@ -400,10 +402,12 @@ RenderScene::RenderScene()
+ 
+ RenderScene::~RenderScene()
+ {
++#if ENABLE_FPS
+     if (pFPSCounter != NULL)
+     {
+         delete pFPSCounter;
+     }
++#endif
+ #if ENABLE_TIMER
+     if(pTimer != NULL)
+     {
+@@ -815,8 +819,10 @@ int RenderScene::initRender(glTFHandle* handle)
+ 
+ void RenderScene::initFPS(unsigned char* fontBuf,unsigned int bufSize)
+ {
++#if ENABLE_FPS
+     pFPSCounter = new FPSCounter(fontBuf,bufSize);
+     pFPSCounter->loadFPSShader(&mShaderProgram);
++#endif
+ }
+ 
+ void RenderScene::renderPrimitive(RenderPrimitive* pPrimitive,
+@@ -1132,10 +1138,12 @@ void RenderScene::drawTriangle(RenderPrimitive* pPrimitive)
+ 
+ void RenderScene::prepareRender(void* lpParam)
+ {
++#if ENABLE_FPS
+     if (pFPSCounter != NULL)
+     {
+         pFPSCounter->timeStamp();
+     }
++#endif
+     viewport = *((glTFViewport*)lpParam);
+     fbo.createAndBindFbo(viewport.width * SSAA, viewport.height * SSAA);
+     glBindFramebuffer(GL_FRAMEBUFFER, fbo.mFboId);
+@@ -1229,10 +1237,12 @@ void RenderScene::renderShader(Technique* pTechnique)
+ 
+ void RenderScene::completeRender()
+ {
++#if ENABLE_FPS
+     if (pFPSCounter != NULL)
+     {
+         pFPSCounter->printFPS(&viewport);
+     }
++#endif
+     glViewport(viewport.x, viewport.y, viewport.width, viewport.height);
+     glBindFramebuffer(GL_FRAMEBUFFER, 0);
+     fbo.renderFboTexture();
+@@ -1356,4 +1366,4 @@ double RenderScene::getAnimDuration()
+ int  RenderScene::isAnimPlay()
+ {
+     return this->mAnimationPlay ? 1 : 0;
+-}
+\ No newline at end of file
++}
+diff --git libgltf/src/RenderScene.h libgltf/src/RenderScene.h
+index cc0b3e5..065a689 100644
+--- libgltf/src/RenderScene.h
++++ libgltf/src/RenderScene.h
+@@ -8,12 +8,22 @@
+ #ifndef RENDERSCENE_H
+ #define RENDERSCENE_H
+ 
++#ifndef ENABLE_FPS
++#define ENABLE_FPS 0
++#endif
++
++#ifndef ENABLE_TIMER
++#define ENABLE_TIMER 0
++#endif
++
+ #include "Shaders.h"
+ #include "Common.h"
+ #include "Texture.h"
+ #include "Camera.h"
+ #include "LoadScene.h"
++#if ENABLE_FPS
+ #include "FPSCounter.h"
++#endif
+ #include "Timer.h"
+ 
+ using namespace glTF;
+@@ -246,7 +256,9 @@ private:
+     bool loadFPSShader();
+     int getFPS();
+     void printFPS(glTFViewport* pViewpoit);
++#if ENABLE_FPS
+     static FPSCounter* pFPSCounter;
++#endif
+     RenderWithFBO fbo;
+ #if ENABLE_TIMER
+     Timer* pTimer;
+diff --git libgltf/src/Timer.h libgltf/src/Timer.h
+index e4d778b..9ab2d74 100644
+--- libgltf/src/Timer.h
++++ libgltf/src/Timer.h
+@@ -10,7 +10,10 @@
+ #include "time.h"
+ #include "Common.h"
+ 
+-#define ENABLE_TIMER 1
++#ifndef ENABLE_TIMER
++#define ENABLE_TIMER 0
++#endif
++
+ #define DETAILED_INFO 1
+ 
+ #if ENABLE_TIMER
-- 
cgit v1.2.3