From d083b5f1478dfc707e23fc60311c510442b9b722 Mon Sep 17 00:00:00 2001 From: Kimmo Hoikka Date: Wed, 14 Jan 2015 20:07:40 +0000 Subject: [PATCH] removed some dead code Change-Id: I4dcf23e02c3f3b22d4401ff146074368f9a3c486 --- dali/internal/update/common/discard-queue.cpp | 2 -- dali/internal/update/common/discard-queue.h | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dali/internal/update/common/discard-queue.cpp b/dali/internal/update/common/discard-queue.cpp index a4ce6ee..c5a6247 100644 --- a/dali/internal/update/common/discard-queue.cpp +++ b/dali/internal/update/common/discard-queue.cpp @@ -143,7 +143,6 @@ void DiscardQueue::Clear( BufferIndex updateBufferIndex ) { mNodeQueue0.Clear(); mAttachmentQueue0.Clear(); - mResourceQueue0.clear(); mMeshQueue0.Clear(); mShaderQueue0.Clear(); } @@ -151,7 +150,6 @@ void DiscardQueue::Clear( BufferIndex updateBufferIndex ) { mNodeQueue1.Clear(); mAttachmentQueue1.Clear(); - mResourceQueue1.clear(); mMeshQueue1.Clear(); mShaderQueue1.Clear(); } diff --git a/dali/internal/update/common/discard-queue.h b/dali/internal/update/common/discard-queue.h index 3e69bab..49a1ca7 100644 --- a/dali/internal/update/common/discard-queue.h +++ b/dali/internal/update/common/discard-queue.h @@ -19,7 +19,6 @@ */ // INTERNAL INCLUDES -#include #include #include #include @@ -53,9 +52,6 @@ class DiscardQueue { public: - typedef IntrusivePtr ResourcePointer; - typedef std::vector ResourceQueue; - typedef OwnerContainer< Shader* > ShaderQueue; /** @@ -127,16 +123,15 @@ private: // Messages are queued here when the update buffer index == 0 NodeOwnerContainer mNodeQueue0; NodeAttachmentOwnerContainer mAttachmentQueue0; - ResourceQueue mResourceQueue0; MeshOwnerContainer mMeshQueue0; ShaderQueue mShaderQueue0; // Messages are queued here when the update buffer index == 1 NodeOwnerContainer mNodeQueue1; NodeAttachmentOwnerContainer mAttachmentQueue1; - ResourceQueue mResourceQueue1; MeshOwnerContainer mMeshQueue1; ShaderQueue mShaderQueue1; + }; } // namespace SceneGraph -- 2.7.4