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-gl-abstraction.h;h=93578038af8ba42d37ae92f54aa8ea214e59685d;hp=292f8b49b3844ab94b18289258e8625056331c24;hb=cc7c738325821be41979913e81fffb961656e0c0;hpb=f1876c34a8f667f79182fa8a772ee889e27290c1 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h index 292f8b4..9357803 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h @@ -38,14 +38,15 @@ namespace Dali { - struct UniformData { - std::string name; - Property::Type type; - UniformData( const std::string& name, Property::Type type = Property::Type::NONE) - : name(name), type(type) - {} + std::string name; + Property::Type type; + UniformData(const std::string& name, Property::Type type = Property::Type::NONE) + : name(name), + type(type) + { + } }; class DALI_CORE_API TestGlAbstraction : public Dali::Integration::GlAbstraction @@ -1006,7 +1007,7 @@ public: GetUniformLocation(program, "uLightCameraProjectionMatrix"); GetUniformLocation(program, "uLightCameraViewMatrix"); - for( const auto& uniform : mCustomUniformData ) + for(const auto& uniform : mCustomUniformData) { GetUniformLocation(program, uniform.name.c_str()); } @@ -1217,16 +1218,10 @@ public: out << std::hex << target << ", " << pname << ", " << param; std::string params = out.str(); - out.str(""); - out << std::hex << target; TraceCallStack::NamedParams namedParams; - namedParams["target"] << out.str(); - out.str(""); - out << std::hex << pname; - namedParams["pname"] << out.str(); - out.str(""); - out << std::hex << param; - namedParams["param"] << out.str(); + namedParams["target"] << std::hex << target; + namedParams["pname"] << std::hex << pname; + namedParams["param"] << param; mTexParameterTrace.PushCall("TexParameteri", params, namedParams); } @@ -2553,7 +2548,7 @@ private: typedef std::map ProgramUniformMap; ProgramUniformMap mUniforms; - std::vector mCustomUniformData{}; + std::vector mCustomUniformData{}; template struct ProgramUniformValue : public std::map >