diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-05 11:47:15 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-05 11:47:43 +0200 |
commit | 841d50ec234e71e8e89d0e9135e2002f35fc42fa (patch) | |
tree | 26f5bc3ad57d75b4418a47696e26dc947e33b96d | |
parent | d085bba9139d882e191b46ee8056d364e7526f88 (diff) |
libgltf: remove obsolete patch
Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7
-rw-r--r-- | external/libgltf/pathces/fix_rendering_of_resized_model.patch | 71 |
1 files changed, 0 insertions, 71 deletions
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 57af9f9e08eb..000000000000 --- 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; |