From 9d9960639243efd6c786eb410421f3f848a6cfc9 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Wed, 7 Feb 2024 20:15:16 +0900 Subject: [PATCH] Apply some missing shader names Change-Id: Iafce95d1725bd05e9c64a249d3de9e565b5d761b Signed-off-by: Eunki, Hong --- dali-scene3d/public-api/loader/shader-definition.cpp | 20 ++++++++++---------- .../internal/visuals/image-visual-shader-factory.cpp | 4 ++-- .../internal/visuals/npatch/npatch-visual.cpp | 10 ++++++++-- .../internal/visuals/visual-factory-cache.cpp | 5 ++++- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dali-scene3d/public-api/loader/shader-definition.cpp b/dali-scene3d/public-api/loader/shader-definition.cpp index 44e71f2..da696a4 100644 --- a/dali-scene3d/public-api/loader/shader-definition.cpp +++ b/dali-scene3d/public-api/loader/shader-definition.cpp @@ -187,16 +187,16 @@ Shader ShaderDefinition::Load(RawData&& raw) const } Property::Map map[2]; - map[0]["vertex"] = raw.mVertexShaderSource; - map[0]["fragment"] = raw.mFragmentShaderSource; - map[0]["renderPassTag"] = 0; - map[0]["hints"] = static_cast(hints); - map[0]["renderPassName"] = "SCENE3D_PBR"; - - map[1]["vertex"] = raw.mShadowVertexShaderSource; - map[1]["fragment"] = raw.mShadowFragmentShaderSource; - map[1]["renderPassTag"] = 10; - map[1]["renderPassName"] = "SCENE3D_SHADOW_MAP"; + map[0]["vertex"] = raw.mVertexShaderSource; + map[0]["fragment"] = raw.mFragmentShaderSource; + map[0]["renderPassTag"] = 0; + map[0]["hints"] = static_cast(hints); + map[0]["name"] = "SCENE3D_PBR"; + + map[1]["vertex"] = raw.mShadowVertexShaderSource; + map[1]["fragment"] = raw.mShadowFragmentShaderSource; + map[1]["renderPassTag"] = 10; + map[1]["name"] = "SCENE3D_SHADOW_MAP"; Property::Array array; array.PushBack(map[0]); diff --git a/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp b/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp index ec4ab2c..e3e8115 100644 --- a/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp +++ b/dali-toolkit/internal/visuals/image-visual-shader-factory.cpp @@ -54,9 +54,9 @@ constexpr std::string_view FragmentPredefines[SHADER_TYPE_COUNT]{ "", // VisualFactoryCache::IMAGE_SHADER, "#define IS_REQUIRED_ROUNDED_CORNER\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER, "#define IS_REQUIRED_YUV_TO_RGB\n", // VisualFactoryCache::IMAGE_SHADER_YUV_TO_RGB, - "#define IS_REQUIRED_YUV_TO_RGB\n#define IS_REQUIRED_ROUNDED_CORNER\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB, + "#define IS_REQUIRED_ROUNDED_CORNER\n#define IS_REQUIRED_YUV_TO_RGB\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_TO_RGB, "#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n", // VisualFactoryCache::IMAGE_SHADER_YUV_AND_RGB, - "#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n#define IS_REQUIRED_ROUNDED_CORNER\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB, + "#define IS_REQUIRED_ROUNDED_CORNER\n#define IS_REQUIRED_UNIFIED_YUV_AND_RGB\n", // VisualFactoryCache::IMAGE_SHADER_ROUNDED_CORNER_YUV_AND_RGB, }; constexpr VisualFactoryCache::ShaderType ShaderTypePredefines[SHADER_TYPE_COUNT]{ VisualFactoryCache::ShaderType::IMAGE_SHADER, diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp index e4ef2aa..2544899 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp @@ -440,12 +440,15 @@ Shader NPatchVisual::CreateShader() } else if(xStretchCount > 0 || yStretchCount > 0) { + std::stringstream shaderName; + shaderName << "N_PATCH_" << xStretchCount << "x" << yStretchCount; + std::stringstream vertexShader; vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" << SHADER_NPATCH_VISUAL_SHADER_VERT; - shader = Shader::New(vertexShader.str(), fragmentShader); + shader = Shader::New(vertexShader.str(), fragmentShader, Dali::Shader::Hint::NONE, shaderName.str()); } } else @@ -472,12 +475,15 @@ Shader NPatchVisual::CreateShader() } else if(xStretchCount > 0 || yStretchCount > 0) { + std::stringstream shaderName; + shaderName << "N_PATCH_" << xStretchCount << "x" << yStretchCount; + std::stringstream vertexShader; vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" << SHADER_NPATCH_VISUAL_SHADER_VERT; - shader = Shader::New(vertexShader.str(), fragmentShader, hints); + shader = Shader::New(vertexShader.str(), fragmentShader, hints, shaderName.str()); } } diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp index 8029a96..e8b5dbf 100644 --- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp @@ -336,11 +336,14 @@ Shader VisualFactoryCache::GetNPatchShader(int index) } else if(xStretchCount > 0 || yStretchCount > 0) { + std::stringstream shaderName; + shaderName << "N_PATCH_" << xStretchCount << "x" << yStretchCount; + std::stringstream vertexShader; vertexShader << "#define FACTOR_SIZE_X " << xStretchCount + 2 << "\n" << "#define FACTOR_SIZE_Y " << yStretchCount + 2 << "\n" << SHADER_NPATCH_VISUAL_SHADER_VERT; - shader = Shader::New(vertexShader.str(), SHADER_NPATCH_VISUAL_SHADER_FRAG); + shader = Shader::New(vertexShader.str(), SHADER_NPATCH_VISUAL_SHADER_FRAG, Dali::Shader::Hint::NONE, shaderName.str()); } return shader; } -- 2.7.4