Merge "Clean up the code to build successfully on macOS" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / render / renderers / render-geometry.cpp

diff --git a/dali/internal/render/renderers/render-geometry.cpp b/dali/internal/render/renderers/render-geometry.cpp
index 17ba522..d3a2809 100644 (file)
--- a/dali/internal/render/renderers/render-geometry.cpp
+++ b/dali/internal/render/renderers/render-geometry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -21,7 +21,7 @@
 #include <dali/internal/common/buffer-index.h>
 #include <dali/internal/render/gl-resources/context.h>
 #include <dali/internal/render/gl-resources/gpu-buffer.h>
-#include <dali/internal/render/renderers/render-property-buffer.h>
+#include <dali/internal/render/renderers/render-vertex-buffer.h>
 #include <dali/internal/render/shaders/program.h>
 
 namespace Dali
@@ -33,7 +33,7 @@ namespace Render
 
 Geometry::Geometry()
 : mIndices(),
-  mIndexBuffer(NULL),
+  mIndexBuffer(nullptr),
   mGeometryType( Dali::Geometry::TRIANGLES ),
   mIndicesChanged(false),
   mHasBeenUpdated(false),
@@ -41,9 +41,7 @@ Geometry::Geometry()
 {
 }
 
-Geometry::~Geometry()
-{
-}
+Geometry::~Geometry() = default;
 
 void Geometry::GlContextCreated( Context& context )
 {
@@ -53,9 +51,9 @@ void Geometry::GlContextDestroyed()
 {
 }
 
-void Geometry::AddPropertyBuffer( Render::PropertyBuffer* propertyBuffer )
+void Geometry::AddVertexBuffer( Render::VertexBuffer* vertexBuffer )
 {
-  mVertexBuffers.PushBack( propertyBuffer );
+  mVertexBuffers.PushBack( vertexBuffer );
   mAttributesChanged = true;
 }
 
@@ -65,14 +63,14 @@ void Geometry::SetIndexBuffer( Dali::Vector<uint16_t>& indices )
   mIndicesChanged = true;
 }
 
-void Geometry::RemovePropertyBuffer( const Render::PropertyBuffer* propertyBuffer )
+void Geometry::RemoveVertexBuffer( const Render::VertexBuffer* vertexBuffer )
 {
   const auto&& end = mVertexBuffers.End();
   for( auto&& iter = mVertexBuffers.Begin(); iter != end; ++iter )
   {
-    if( *iter == propertyBuffer )
+    if( *iter == vertexBuffer )
     {
-      //This will delete the gpu buffer associated to the RenderPropertyBuffer if there is one
+      //This will delete the gpu buffer associated to the RenderVertexBuffer if there is one
       mVertexBuffers.Remove( iter );
       mAttributesChanged = true;
       break;
@@ -118,11 +116,11 @@ void Geometry::Upload( Context& context )
     {
       if( mIndices.Empty() )
       {
-        mIndexBuffer = NULL;
+        mIndexBuffer = nullptr;
       }
       else
       {
-        if ( mIndexBuffer == NULL )
+        if ( mIndexBuffer == nullptr )
         {
           mIndexBuffer = new GpuBuffer( context );
         }