X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Frenderers%2Frender-geometry.h;h=2f04c973133649a9ca9019ba24804ed03fef1eda;hb=a513234144a775134eff3a24144983a5e374d1d5;hp=90f06afd7c58c7c5d914b6c51db4dbf69ad86b7e;hpb=3b20d8e3e6922ee57cfbd78a86db9ee744cbe32a;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/renderers/render-geometry.h b/dali/internal/render/renderers/render-geometry.h
index 90f06af..2f04c97 100644
--- a/dali/internal/render/renderers/render-geometry.h
+++ b/dali/internal/render/renderers/render-geometry.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_RENDER_GEOMETRY_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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.
@@ -17,28 +17,25 @@
  * limitations under the License.
  */
 
-#include <dali/public-api/common/dali-vector.h>
+// INTERNAL INCLUDES
 #include <dali/devel-api/common/owner-container.h>
-#include <dali/devel-api/rendering/geometry.h>
-#include <dali/internal/common/owner-pointer.h>
-#include <dali/integration-api/gl-defines.h>
+#include <dali/graphics-api/graphics-controller.h>
+#include <dali/graphics-api/graphics-types.h>
 #include <dali/internal/common/buffer-index.h>
 #include <dali/internal/common/owner-pointer.h>
-#include <dali/integration-api/gl-abstraction.h>
-#include <dali/devel-api/rendering/geometry.h>
-
+#include <dali/public-api/common/dali-vector.h>
+#include <dali/public-api/rendering/geometry.h>
 
 namespace Dali
 {
 namespace Internal
 {
-class Context;
 class Program;
 class GpuBuffer;
 
 namespace Render
 {
-class PropertyBuffer;
+class VertexBuffer;
 
 /**
  * This class encapsulates the GPU buffers. It is used to upload vertex data
@@ -48,7 +45,11 @@ class PropertyBuffer;
 class Geometry
 {
 public:
-  typedef Dali::Geometry::GeometryType GeometryType;
+  using Type      = Dali::Geometry::Type;
+  using IndexType = Dali::Graphics::Format;
+
+  using Uint16ContainerType = Dali::Vector<uint16_t>;
+  using Uint32ContainerType = Dali::Vector<uint32_t>;
 
   Geometry();
 
@@ -58,40 +59,34 @@ public:
   ~Geometry();
 
   /**
-   * Called on Gl Context created
-   */
-  void GlContextCreated( Context& context );
-
-  /**
-   * Called on Gl Context destroyed.
+   * Adds a property buffer to the geometry
+   * @param[in] dataProvider The VertexBuffer data provider
    */
-  void GlContextDestroyed();
+  void AddVertexBuffer(Render::VertexBuffer* vertexBuffer);
 
   /**
-   * Adds a property buffer to the geometry
-   * @param[in] dataProvider The PropertyBuffer data provider
+   * Set the data for the index buffer to be used by the geometry
+   * @param[in] indices A vector containing the indices
    */
-  void AddPropertyBuffer( Render::PropertyBuffer* propertyBuffer );
+  void SetIndexBuffer(Uint16ContainerType& indices);
 
   /**
    * Set the data for the index buffer to be used by the geometry
    * @param[in] indices A vector containing the indices
    */
-  void SetIndexBuffer( Dali::Vector<unsigned short>& indices );
+  void SetIndexBuffer(Uint32ContainerType& indices);
 
   /**
-   * Removes a PropertyBuffer from the geometry
-   * @param[in] propertyBuffer The property buffer to be removed
+   * Removes a VertexBuffer from the geometry
+   * @param[in] vertexBuffer The property buffer to be removed
    */
-  void RemovePropertyBuffer(  const Render::PropertyBuffer* propertyBuffer );
+  void RemoveVertexBuffer(const Render::VertexBuffer* vertexBuffer);
 
   /**
-   * Gets the attribute locations on the shader for the attributes defined in the geometry RenderBuffers
-   * @param[out] attributeLocation The vector where the attributes locations will be stored
-   * @param[in] program The program
-   * @param[in] bufferIndex The current buffer index
+   * Get the vertex buffers
+   * @return the list of vertex buffers
    */
-  void GetAttributeLocationFromProgram( Vector<GLint>& attributeLocation, Program& program, BufferIndex bufferIndex ) const;
+  [[nodiscard]] const Vector<Render::VertexBuffer*>& GetVertexBuffers() const;
 
   /**
    * Called from RenderManager to notify the geometry that current rendering pass has finished.
@@ -99,10 +94,10 @@ public:
   void OnRenderFinished();
 
   /**
-   * Chack if the attributes for the geometry have changed
+   * Check if the attributes for the geometry have changed
    * @return True if vertex buffers have been added or removed since last frame, false otherwise
    */
-  bool AttributesChanged() const
+  [[maybe_unused]] [[nodiscard]] bool AttributesChanged() const
   {
     return mAttributesChanged;
   }
@@ -111,40 +106,56 @@ public:
    * Sets the geometry type
    * @param[in] type The new geometry type
    */
-  void SetGeometryType( GeometryType type )
+  void SetType(Type type)
   {
     mGeometryType = type;
   }
 
   /**
-   * Upload the geometry if it has changed, set up the attributes and perform
-   * the Draw call corresponding to the geometry type
-   * @param[in] context The GL context
-   * @param[in] bufferIndex The current buffer index
-   * @param[in] attributeLocation The location for the attributes in the shader
+   * @return the topology of this geometry
+   */
+  [[nodiscard]] Graphics::PrimitiveTopology GetTopology() const;
+
+  /**
+   * Upload the geometry if it has changed
+   */
+  void Upload(Graphics::Controller& graphicsController);
+
+  /**
+   * Set up the attributes and perform the Draw call corresponding to the geometry type.
+   *
+   * @param[in] graphicsController The graphics controller
+   * @param[in,out] commandBuffer The current command buffer queue
    * @param[in] elementBufferOffset The index of first element to draw if index buffer bound
-   * @param[in] elementBufferCount Number of elements to draw if index buffer bound
+   * @param[in] elementBufferCount Number of elements to draw if index buffer bound, uses whole buffer when 0
+   * @return true if the draw command was issued, false otherwise
    */
-  void UploadAndDraw(Context& context,
-                     BufferIndex bufferIndex,
-                     Vector<GLint>& attributeLocation,
-                     size_t elementBufferOffset,
-                     size_t elementBufferCount );
+  bool Draw(Graphics::Controller&    graphicsController,
+            Graphics::CommandBuffer& commandBuffer,
+            uint32_t                 elementBufferOffset,
+            uint32_t                 elementBufferCount);
 
-private:
+  /**
+   * @brief Set up the attributes bind commaneds
+   *
+   * @param[in,out] commandBuffer The current command buffer queue
+   * @return true if the bind command was issued, false otherwise
+   */
+  bool BindVertexAttributes(Graphics::CommandBuffer& commandBuffer);
 
-  // PropertyBuffers
-  Vector< Render::PropertyBuffer* > mVertexBuffers;
+private:
+  // VertexBuffers
+  Vector<Render::VertexBuffer*> mVertexBuffers;
 
-  Dali::Vector< unsigned short> mIndices;
-  OwnerPointer< GpuBuffer > mIndexBuffer;
-  GeometryType mGeometryType;
+  Uint16ContainerType     mIndices;
+  OwnerPointer<GpuBuffer> mIndexBuffer;
+  IndexType               mIndexType;
+  Type                    mGeometryType;
 
   // Booleans
   bool mIndicesChanged : 1;
   bool mHasBeenUpdated : 1;
   bool mAttributesChanged : 1;
-
 };
 
 } // namespace Render