Revert "[Tizen] Reset To 2.3.42"

This reverts commit 11590bb63665ccedd4143bd9116ab16d735dc44d.

diff --git a/dali-toolkit/internal/visuals/custom-shader-factory.cpp b/dali-toolkit/internal/visuals/custom-shader-factory.cpp
index eb05b7bbfe9face7d9938949afc3a64bb7f2c798..e0b345cf0d3e1bf9f24d356d4d964d9864627835 100644 (file)
--- a/dali-toolkit/internal/visuals/custom-shader-factory.cpp
+++ b/dali-toolkit/internal/visuals/custom-shader-factory.cpp
@@ -28,6 +28,7 @@ namespace Toolkit
 {
 namespace Internal
 {
+
 CustomShaderFactory::CustomShaderFactory()
 {
 }
@@ -38,8 +39,8 @@ CustomShaderFactory::~CustomShaderFactory()
 
 bool CustomShaderFactory::AddPrecompiledShader(PrecompileShaderOption& option)
 {
-  auto shaderName     = option.GetShaderName();
-  auto vertexShader   = option.GetVertexShader();
+  auto shaderName = option.GetShaderName();
+  auto vertexShader = option.GetVertexShader();
   auto fragmentShader = option.GetFragmentShader();
   return SavePrecompileShader(shaderName, vertexShader, fragmentShader);
 }
@@ -53,7 +54,7 @@ void CustomShaderFactory::GetPreCompiledShader(RawShaderData& shaders)
   shaders.shaderCount                       = 0;
 
   // precompile requested shader first
-  for(uint32_t i = 0; i < mRequestedPrecompileShader.size(); i++)
+  for(uint32_t i = 0; i < mRequestedPrecompileShader.size(); i++ )
   {
     vertexPrefix.push_back(mRequestedPrecompileShader[i].vertexPrefix);
     fragmentPrefix.push_back(mRequestedPrecompileShader[i].fragmentPrefix);
@@ -67,18 +68,17 @@ void CustomShaderFactory::GetPreCompiledShader(RawShaderData& shaders)
   shaders.vertexShader   = ""; // Custom shader use prefix shader only. No need to set vertexShader and fragmentShader.
   shaders.fragmentShader = ""; // Custom shader use prefix shader only. No need to set vertexShader and fragmentShader.
   shaders.shaderCount    = std::move(shaderCount);
-  shaders.custom         = true;
+  shaders.custom = true;
 }
 
 bool CustomShaderFactory::SavePrecompileShader(std::string& shaderName, std::string& vertexShader, std::string& fragmentShader)
 {
   RequestShaderInfo info;
-  info.type           = VisualFactoryCache::SHADER_TYPE_MAX; ///< Not be used
-  info.name           = shaderName;
-  info.vertexPrefix   = vertexShader;
+  info.name = shaderName;
+  info.vertexPrefix = vertexShader;
   info.fragmentPrefix = fragmentShader;
   mRequestedPrecompileShader.push_back(info);
-  DALI_LOG_RELEASE_INFO("Add precompile shader success!!(%s)", shaderName.c_str());
+  DALI_LOG_RELEASE_INFO("Add precompile shader success!!(%s)",shaderName.c_str());
   return true;
 }
 

diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h
index cc59ea708185c32c06cd4e7adede710d10675660..7270b349b64dae43fc6dc2a95fea54b44525aa80 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -143,7 +143,7 @@ public:
     WIREFRAME_SHADER,
     ARC_BUTT_CAP_SHADER,
     ARC_ROUND_CAP_SHADER,
-    SHADER_TYPE_MAX
+    SHADER_TYPE_MAX = ARC_ROUND_CAP_SHADER
   };
 
   /**
@@ -156,7 +156,7 @@ public:
     NINE_PATCH_GEOMETRY,
     NINE_PATCH_BORDER_GEOMETRY,
     WIREFRAME_GEOMETRY,
-    GEOMETRY_TYPE_MAX
+    GEOMETRY_TYPE_MAX = WIREFRAME_GEOMETRY
   };
 
 public:
@@ -368,8 +368,8 @@ private:
     uint32_t                 height;
   };
 
-  Geometry mGeometry[GEOMETRY_TYPE_MAX];
-  Shader   mShader[SHADER_TYPE_MAX];
+  Geometry mGeometry[GEOMETRY_TYPE_MAX + 1];
+  Shader   mShader[SHADER_TYPE_MAX + 1];
 
   bool mLoadYuvPlanes; ///< A global flag to specify if the image should be loaded as yuv planes
 

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 92b2fa87ee00519f12d65766b926924a1cd785b2..8242f75054393b312891aca282108ad8f269f906 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -39,11 +39,11 @@
 #include <dali-toolkit/internal/visuals/color/color-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/custom-shader-factory.h>
+#include <dali-toolkit/internal/visuals/npatch-shader-factory.h>
 #include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
 #include <dali-toolkit/internal/visuals/image/image-visual-shader-factory.h>
 #include <dali-toolkit/internal/visuals/image/image-visual.h>
 #include <dali-toolkit/internal/visuals/mesh/mesh-visual.h>
-#include <dali-toolkit/internal/visuals/npatch-shader-factory.h>
 #include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
 #include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
 #include <dali-toolkit/internal/visuals/svg/svg-visual.h>
@@ -422,7 +422,7 @@ void VisualFactory::DiscardVisual(Toolkit::Visual::Base visual)
 bool VisualFactory::AddPrecompileShader(const Property::Map& map)
 {
   PrecompileShaderOption shaderOption(map);
-  auto                   type = shaderOption.GetShaderType();
+  auto type = shaderOption.GetShaderType();
   if(type == PrecompileShaderOption::ShaderType::UNKNOWN)
   {
     DALI_LOG_ERROR("AddPrecompileShader is failed. we can't find shader type");
@@ -567,7 +567,7 @@ CustomShaderFactory& VisualFactory::GetCustomShaderFactory()
 bool VisualFactory::AddPrecompileShader(PrecompileShaderOption& option)
 {
   auto type = option.GetShaderType();
-  bool ret  = false;
+  bool ret = false;
   switch(type)
   {
     case PrecompileShaderOption::ShaderType::COLOR:
@@ -588,7 +588,6 @@ bool VisualFactory::AddPrecompileShader(PrecompileShaderOption& option)
     case PrecompileShaderOption::ShaderType::NPATCH:
     {
       ret = GetNpatchShaderFactory().AddPrecompiledShader(option);
-      break;
     }
     case PrecompileShaderOption::ShaderType::MODEL_3D:
     {
@@ -602,7 +601,7 @@ bool VisualFactory::AddPrecompileShader(PrecompileShaderOption& option)
     }
     default:
     {
-      DALI_LOG_ERROR("AddPrecompileShader is failed. we can't find shader factory type:%d", type);
+      DALI_LOG_ERROR("AddPrecompileShader is failed. we can't find shader factory type:%d",type);
       break;
     }
   }

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index ab3f861e9baadb83e73d5fbd73b7c65b3c154eb8..0767a72478e5d128e8ff345d4feb3aa92d08d974 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -29,7 +29,7 @@ namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
 const unsigned int TOOLKIT_MINOR_VERSION = 3;
-const unsigned int TOOLKIT_MICRO_VERSION = 42;
+const unsigned int TOOLKIT_MICRO_VERSION = 41;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index b69284849468f2fb2f7915c856d841eaff1e07de..e0672214d4651bf729873ad89e0be6f3ac647ff3 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.3.42
+Version:    2.3.41
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT