X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-graphics-buffer.cpp;h=fb06c3dc9167835d46dcbee1be1189d861daf23b;hp=b64b9ee8b3572e337b4925a84eae84d6b37f8b75;hb=5cf8a1a1a83ae490ca79fff224a1e4de2c42816c;hpb=100f0f8554f97295dd52e01a91ef2b868eba3554

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
index b64b9ee..fb06c3d 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "test-graphics-buffer.h"
-#include "test-graphics-program.h"
-#include "test-graphics-reflection.h"
 #include <sstream>
 #include "dali-test-suite-utils.h"
+#include "test-graphics-program.h"
+#include "test-graphics-reflection.h"
 
 namespace Dali
 {
@@ -27,7 +27,7 @@ TestGraphicsBuffer::TestGraphicsBuffer(TraceCallStack& callStack, TestGlAbstract
   mGl(glAbstraction),
   mUsage(usage)
 {
-  memory.reserve(size);
+  memory.resize(size);
   mGl.GetBufferTrace().EnableLogging(true);
 }
 
@@ -80,62 +80,62 @@ GLenum TestGraphicsBuffer::GetTarget()
   return target;
 }
 
-void TestGraphicsBuffer::BindAsUniformBuffer( const TestGraphicsProgram* program ) const
+void TestGraphicsBuffer::BindAsUniformBuffer(const TestGraphicsProgram* program, const Dali::UniformBufferBindingDescriptor& uboBinding) const
 {
   auto* reflection = static_cast<const TestGraphicsReflection*>(&program->GetReflection());
 
   Graphics::UniformBlockInfo uboInfo{};
   reflection->GetUniformBlock(0, uboInfo);
 
-  auto* data = memory.data();
+  auto offset = uboBinding.offset;
+  auto* data = memory.data() + offset;
 
-  for( const auto& member : uboInfo.members )
+  for(const auto& member : uboInfo.members)
   {
-    auto type = reflection->GetMemberType( 0, member.location );
+    auto type = reflection->GetMemberType(0, member.location);
     switch(type)
     {
       case Property::VECTOR4:
       {
-        auto value = *reinterpret_cast<const Dali::Vector4*>(data+member.offset);
-        mGl.Uniform4f( member.location, value.x, value.y, value.z, value.w );
+        auto value = *reinterpret_cast<const Dali::Vector4*>(data + member.offset);
+        mGl.Uniform4f(member.location, value.x, value.y, value.z, value.w);
         break;
       }
       case Property::VECTOR3:
       {
-        auto value = *reinterpret_cast<const Dali::Vector3*>(data+member.offset);
-        mGl.Uniform3f( member.location, value.x, value.y, value.z );
+        auto value = *reinterpret_cast<const Dali::Vector3*>(data + member.offset);
+        mGl.Uniform3f(member.location, value.x, value.y, value.z);
         break;
       }
       case Property::VECTOR2:
       {
-        auto value = *reinterpret_cast<const Dali::Vector2*>(data+member.offset);
-        mGl.Uniform2f( member.location, value.x, value.y );
+        auto value = *reinterpret_cast<const Dali::Vector2*>(data + member.offset);
+        mGl.Uniform2f(member.location, value.x, value.y);
         break;
       }
       case Property::FLOAT:
       {
-        auto value = *reinterpret_cast<const float*>(data+member.offset);
-        fprintf(stderr, "BindAsUniformBuffer: %s, value: %f\n", member.name.c_str(), value);
-        mGl.Uniform1f( member.location, value );
+        auto value = *reinterpret_cast<const float*>(data + member.offset);
+        mGl.Uniform1f(member.location, value);
         break;
       }
       case Property::INTEGER:
       {
-        auto ptr = reinterpret_cast<const GLint*>(data+member.offset);
+        auto ptr   = reinterpret_cast<const GLint*>(data + member.offset);
         auto value = *ptr;
-        mGl.Uniform1i( member.location, value );
+        mGl.Uniform1i(member.location, value);
         break;
       }
       case Property::MATRIX:
       {
-        auto value = reinterpret_cast<const float*>(data+member.offset);
-        mGl.UniformMatrix4fv( member.location, 1, GL_FALSE, value );
+        auto value = reinterpret_cast<const float*>(data + member.offset);
+        mGl.UniformMatrix4fv(member.location, 1, GL_FALSE, value);
         break;
       }
       case Property::MATRIX3:
       {
-        auto value = reinterpret_cast<const float*>(data+member.offset);
-        mGl.UniformMatrix3fv( member.location, 1, GL_FALSE, value );
+        auto value = reinterpret_cast<const float*>(data + member.offset);
+        mGl.UniformMatrix3fv(member.location, 1, GL_FALSE, value);
         break;
       }
       default:
@@ -144,8 +144,6 @@ void TestGraphicsBuffer::BindAsUniformBuffer( const TestGraphicsProgram* program
       }
     }
   }
-
-
 }
 
 } // namespace Dali