From abf7c5eab255d9ce76dfc76234023bb534b3bd11 Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Sun, 18 Dec 2022 23:44:53 +0900 Subject: [PATCH] Remove annoying log message Since DecoratedVisual / Text / PBR shader use #define tag, current sampler using logic might not works well. Change-Id: I8468e42415fae717c4bde20cb918645331f4f533 Signed-off-by: Eunki Hong --- .../graphics/gles-impl/gles-graphics-reflection.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dali/internal/graphics/gles-impl/gles-graphics-reflection.cpp b/dali/internal/graphics/gles-impl/gles-graphics-reflection.cpp index 05776c2..e67471d 100644 --- a/dali/internal/graphics/gles-impl/gles-graphics-reflection.cpp +++ b/dali/internal/graphics/gles-impl/gles-graphics-reflection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,10 @@ namespace { +#if defined(DEBUG_ENABLED) +Debug::Filter* gGraphicsReflectionLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_GRAPHICS_REFLECTION"); +#endif + struct StringSize { const char* const mString; @@ -171,7 +175,7 @@ void ParseShaderSamplers(std::string shaderSource, std::vectorGetProgramiv(glProgram, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxLength); gl->GetProgramiv(glProgram, GL_ACTIVE_ATTRIBUTES, &nAttribs); @@ -254,6 +260,8 @@ void Reflection::BuildUniformReflection() return; } + DALI_LOG_INFO(gGraphicsReflectionLogFilter, Debug::General, "Build uniform reflection for glProgram : %u\n", glProgram); + gl->GetProgramiv(glProgram, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxLen); gl->GetProgramiv(glProgram, GL_ACTIVE_UNIFORMS, &numUniforms); @@ -365,6 +373,8 @@ void Reflection::BuildUniformBlockReflection() return; } + DALI_LOG_INFO(gGraphicsReflectionLogFilter, Debug::General, "Build uniform block reflection for glProgram : %u\n", glProgram); + gl->GetProgramiv(glProgram, GL_ACTIVE_UNIFORM_BLOCKS, &numUniformBlocks); mUniformBlocks.clear(); @@ -420,6 +430,7 @@ void Reflection::BuildUniformBlockReflection() uint32_t Reflection::GetVertexAttributeLocation(const std::string& name) const { + DALI_LOG_INFO(gGraphicsReflectionLogFilter, Debug::Verbose, "name : %s\n", name.c_str()); for(auto&& attr : mVertexInputAttributes) { if(attr.name == name) @@ -432,6 +443,7 @@ uint32_t Reflection::GetVertexAttributeLocation(const std::string& name) const Dali::Graphics::VertexInputAttributeFormat Reflection::GetVertexAttributeFormat(uint32_t location) const { + DALI_LOG_INFO(gGraphicsReflectionLogFilter, Debug::Verbose, "location : %u\n", location); if(location >= mVertexInputAttributes.size()) { return Dali::Graphics::VertexInputAttributeFormat::UNDEFINED; @@ -442,6 +454,7 @@ Dali::Graphics::VertexInputAttributeFormat Reflection::GetVertexAttributeFormat( std::string Reflection::GetVertexAttributeName(uint32_t location) const { + DALI_LOG_INFO(gGraphicsReflectionLogFilter, Debug::Verbose, "location : %u\n", location); if(location >= mVertexInputAttributes.size()) { return std::string(); -- 2.7.4