-#ifndef __DALI_INTERNAL_DISCARD_QUEUE_H__
-#define __DALI_INTERNAL_DISCARD_QUEUE_H__
+#ifndef DALI_INTERNAL_DISCARD_QUEUE_H
+#define DALI_INTERNAL_DISCARD_QUEUE_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// INTERNAL INCLUDES
#include <dali/public-api/object/ref-object.h>
+#include <dali/devel-api/common/owner-container.h>
#include <dali/internal/common/buffer-index.h>
-#include <dali/internal/common/owner-container.h>
#include <dali/internal/update/nodes/node-declarations.h>
-#include <dali/internal/update/node-attachments/node-attachment-declarations.h>
-#include <dali/internal/update/common/scene-graph-property-buffer.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/update/rendering/scene-graph-sampler.h>
+#include <dali/internal/update/rendering/scene-graph-texture-set.h>
+#include <dali/internal/update/rendering/scene-graph-renderer.h>
namespace Dali
{
namespace Internal
{
-class Texture;
-
namespace SceneGraph
{
-class Node;
class RenderQueue;
class Shader;
+class Camera;
+class Scene;
/**
class DiscardQueue
{
public:
-
- typedef OwnerContainer< Shader* > ShaderQueue;
- typedef OwnerContainer< Geometry* > GeometryQueue;
- typedef OwnerContainer< Material* > MaterialQueue;
- typedef OwnerContainer< Sampler* > SamplerQueue;
- typedef OwnerContainer< PropertyBuffer* > PropertyBufferQueue;
+ using ShaderQueue = OwnerContainer<Shader*>;
+ using RendererQueue = OwnerContainer<Renderer*>;
+ using CameraQueue = OwnerContainer<Camera*>;
+ using SceneQueue = OwnerContainer<Scene*>;
/**
* Create a new DiscardQueue.
void Add( BufferIndex updateBufferIndex, Node* node );
/**
- * Adds an unwanted NodeAttachment to the discard queue.
- * If necessary, a message will be sent to clean-up GL resources in the next Render.
+ * Adds an unwanted shader to the discard queue.
+ * A message will be sent to clean-up GL resources in the next Render.
* @pre This method is not thread-safe, and should only be called from the update-thread.
- * @param[in] updateBufferIndex The current update buffer index.
- * @param[in] attachment The discarded attachment; DiscardQueue takes ownership.
- */
- void Add( BufferIndex updateBufferIndex, NodeAttachment* attachment );
-
- /**
- * Adds an unwanted geometry to the discard queue.
- * A message will be sent to clean up GL resources in the next Render
+ * @param[in] bufferIndex The current update buffer index.
+ * @param[in] shader The shader to queue; DiscardQueue takes ownership.
*/
- void Add( BufferIndex updateBufferIndex, Geometry* geometry );
+ void Add( BufferIndex bufferIndex, Shader* shader );
/**
- * Adds an unwanted material to the discard queue.
+ * Adds an unwanted Renderer to the discard queue.
* A message will be sent to clean up GL resources in the next Render.
+ * @param[in] updateBufferIndex The current update buffer index.
+ * @param[in] renderer The discarded renderer; DiscardQueue takes ownership.
*/
- void Add( BufferIndex updateBufferIndex, PropertyBuffer* material );
+ void Add( BufferIndex updateBufferIndex, Renderer* renderer );
/**
- * Adds an unwanted material to the discard queue.
- * A message will be sent to clean up GL resources in the next Render.
+ * Adds an unwanted Camera to the discard queue.
+ * This is done because Render thread may use Matrices from the camera
+ * @param[in] updateBufferIndex The current update buffer index.
+ * @param[in] camera The discarded renderer; DiscardQueue takes ownership.
*/
- void Add( BufferIndex updateBufferIndex, Material* material );
+ void Add( BufferIndex updateBufferIndex, Camera* camera );
/**
- * Adds an unwanted material to the discard queue.
+ * Adds an unwanted Scene to the discard queue.
* A message will be sent to clean up GL resources in the next Render.
+ * @param[in] updateBufferIndex The current update buffer index.
+ * @param[in] scene The discarded scene; DiscardQueue takes ownership.
*/
- void Add( BufferIndex updateBufferIndex, Sampler* material );
-
- /**
- * Adds an unwanted shader to the discard queue.
- * A message will be sent to clean-up GL resources in the next Render.
- * @pre This method is not thread-safe, and should only be called from the update-thread.
- * @param[in] bufferIndex The current update buffer index.
- * @param[in] shader The shader to queue; DiscardQueue takes ownership.
- */
- void Add( BufferIndex bufferIndex, Shader* shader );
+ void Add( BufferIndex updateBufferIndex, Scene* scene );
/**
* Release the nodes which were queued in the frame N-2.
RenderQueue& mRenderQueue; ///< Used to send GL clean-up messages for the next Render.
- // Messages are queued here when the update buffer index == 0
- NodeOwnerContainer mNodeQueue0;
- NodeAttachmentOwnerContainer mAttachmentQueue0;
- ShaderQueue mShaderQueue0;
- GeometryQueue mGeometryQueue0;
- MaterialQueue mMaterialQueue0;
- SamplerQueue mSamplerQueue0;
- PropertyBufferQueue mPropertyBufferQueue0;
-
- // Messages are queued here when the update buffer index == 1
- NodeOwnerContainer mNodeQueue1;
- NodeAttachmentOwnerContainer mAttachmentQueue1;
- ShaderQueue mShaderQueue1;
- GeometryQueue mGeometryQueue1;
- MaterialQueue mMaterialQueue1;
- SamplerQueue mSamplerQueue1;
- PropertyBufferQueue mPropertyBufferQueue1;
+ // Messages are queued here following the current update buffer number
+ OwnerContainer< Node* > mNodeQueue[2];
+ ShaderQueue mShaderQueue[2];
+ RendererQueue mRendererQueue[2];
+ CameraQueue mCameraQueue[2];
+ SceneQueue mSceneQueue[2];
};
} // namespace SceneGraph
} // namespace Dali
-#endif // __DALI_INTERNAL_RESOURCE_DISCARD_QUEUE_H__
+#endif // DALI_INTERNAL_DISCARD_QUEUE_H
projects / platform / core / uifw / dali-core.git / blobdiff