X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=7cc51198fb1a378b01b75f207541150c4b48b6df;hb=2924ca60a4f301c4b0a5559daa6aac9652e4c10e;hp=77c7b8c970114a3bc018bddc7a58ded04b521a4a;hpb=575395b7c3c37e49a910ad141b3cd0f4b037ae98;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 77c7b8c..7cc5119 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -76,16 +75,6 @@ DALI_TYPE_REGISTRATION_BEGIN_CREATE(Toolkit::VisualFactory, Dali::BaseHandle, Cr DALI_TYPE_REGISTRATION_END() const char* const BROKEN_IMAGE_FILE_NAME = "broken.png"; ///< The file name of the broken image. -static constexpr auto SHADER_TYPE_COUNT = 2u; -const std::string_view VertexPredefines[SHADER_TYPE_COUNT]{ - "", //VisualFactoryCache::COLOR_SHADER - "#define IS_REQUIRED_ROUNDED_CORNER\n", //VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER -}; -const std::string_view FragmentPredefines[SHADER_TYPE_COUNT]{ - "", //VisualFactoryCache::COLOR_SHADER - "#define IS_REQUIRED_ROUNDED_CORNER\n", //VisualFactoryCache::COLOR_SHADER_ROUNDED_CORNER -}; - } // namespace VisualFactory::VisualFactory(bool debugEnabled) @@ -404,36 +393,6 @@ void VisualFactory::DiscardVisual(Toolkit::Visual::Base visual) RegisterDiscardCallback(); } -void VisualFactory::UsePreCompiledShader() -{ - if(mPrecompiledShaderRequested) - { - return; - } - mPrecompiledShaderRequested = true; - - Integration::ShaderPrecompiler::Get().Enable(); - - // Get image shader - std::vector rawShaderList; - RawShaderData imageShaderData; - GetImageVisualShaderFactory().GetPrecompiledShader(imageShaderData); - rawShaderList.push_back(imageShaderData); - - // Get text shader - RawShaderData textShaderData; - GetTextVisualShaderFactory().GetPrecompiledShader(textShaderData); - rawShaderList.push_back(textShaderData); - - // Get color shader - RawShaderData colorShaderData; - GetPrecompiledShader(colorShaderData); - rawShaderList.push_back(colorShaderData); - - // Save all shader - Integration::ShaderPrecompiler::Get().SavePrecomipleShaderList(rawShaderList); -} - Internal::TextureManager& VisualFactory::GetTextureManager() { return GetFactoryCache().GetTextureManager(); @@ -459,26 +418,6 @@ void VisualFactory::SetBrokenImageUrl(Toolkit::StyleManager& styleManager) mFactoryCache->SetBrokenImageUrl(brokenImageUrl, customBrokenImageUrlList); } -void VisualFactory::GetPrecompiledShader(RawShaderData& shaders) -{ - std::vector vertexPrefix; - std::vector fragmentPrefix; - int shaderCount = 0; - shaders.shaderCount = 0; - for(int i = 0; i < SHADER_TYPE_COUNT; ++i) - { - vertexPrefix.push_back(VertexPredefines[i]); - fragmentPrefix.push_back(FragmentPredefines[i]); - shaderCount++; - } - - shaders.vertexPrefix = vertexPrefix; - shaders.fragmentPrefix = fragmentPrefix; - shaders.vertexShader = SHADER_COLOR_VISUAL_SHADER_VERT; - shaders.fragmentShader = SHADER_COLOR_VISUAL_SHADER_FRAG; - shaders.shaderCount = shaderCount; -} - Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() { if(!mFactoryCache) @@ -492,9 +431,6 @@ Internal::VisualFactoryCache& VisualFactory::GetFactoryCache() } SetBrokenImageUrl(styleManager); } - - //UsePreCompiledShader(); // Call forcelly - return *mFactoryCache; }