Add Default Uniform : uActorColor

[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 a8970a0..e12f37b 100644 (file)
--- a/dali/internal/render/renderers/render-geometry.cpp
+++ b/dali/internal/render/renderers/render-geometry.cpp
@@ -19,7 +19,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/common/buffer-index.h>
-#include <dali/internal/render/gl-resources/gpu-buffer.h>
 #include <dali/internal/render/renderers/render-vertex-buffer.h>
 #include <dali/internal/render/shaders/program.h>
 
@@ -124,7 +123,7 @@ bool Geometry::Draw(
   uint32_t                 elementBufferCount)
 {
   //Bind buffers to attribute locations
-  const uint32_t vertexBufferCount = static_cast<uint32_t>(mVertexBuffers.Count());
+  const auto vertexBufferCount = static_cast<uint32_t>(mVertexBuffers.Count());
 
   std::vector<const Graphics::Buffer*> buffers;
   std::vector<uint32_t>                offsets;
@@ -144,7 +143,7 @@ bool Geometry::Draw(
     }
     //@todo Figure out why this is being drawn without geometry having been uploaded
   }
-  if(buffers.size() == 0)
+  if(buffers.empty())
   {
     return false;
   }
@@ -160,7 +159,7 @@ bool Geometry::Draw(
     if(elementBufferOffset != 0u)
     {
       elementBufferOffset = (elementBufferOffset >= numIndices) ? numIndices - 1 : elementBufferOffset;
-      firstIndexOffset    = elementBufferOffset * sizeof(GLushort);
+      firstIndexOffset    = intptr_t(elementBufferOffset * sizeof(uint16_t));
       numIndices -= elementBufferOffset;
     }
 
@@ -184,12 +183,12 @@ bool Geometry::Draw(
   }
   else
   {
-    //Unindex draw call
-    GLsizei numVertices(0u);
+    // Un-indexed draw call
+    uint32_t numVertices(0u);
     if(vertexBufferCount > 0)
     {
       // truncated, no value loss happening in practice
-      numVertices = static_cast<GLsizei>(mVertexBuffers[0]->GetElementCount());
+      numVertices = static_cast<uint32_t>(mVertexBuffers[0]->GetElementCount());
     }
 
     commandBuffer.Draw(numVertices, 1, 0, 0);