Output error log on shader link failure

Change-Id: Ic7bd0439c71cb76be91f506f7c93d81195579cf7

diff --git a/dali/internal/graphics/gles-impl/gles-graphics-pipeline-cache.cpp b/dali/internal/graphics/gles-impl/gles-graphics-pipeline-cache.cpp
index ccf7e61..e35faaa 100755 (executable)
--- a/dali/internal/graphics/gles-impl/gles-graphics-pipeline-cache.cpp
+++ b/dali/internal/graphics/gles-impl/gles-graphics-pipeline-cache.cpp
@@ -442,7 +442,7 @@ Graphics::UniquePtr<Graphics::Program> PipelineCache::GetProgram(const ProgramCr
     // create new pipeline
     auto program = MakeUnique<GLES::ProgramImpl>(programCreateInfo, mImpl->controller);
 
-    program->Create();
+    program->Create(); // Don't currently handle failure.
 
     cachedProgram = program.get();
 

diff --git a/dali/internal/graphics/gles-impl/gles-graphics-program.cpp b/dali/internal/graphics/gles-impl/gles-graphics-program.cpp
index af1baa4..d7fc0a7 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles-graphics-program.cpp
+++ b/dali/internal/graphics/gles-impl/gles-graphics-program.cpp
@@ -164,7 +164,7 @@ bool ProgramImpl::Create()
     gl->GetProgramInfoLog(program, 4096, &size, output);
 
     // log on error
-    DALI_LOG_INFO(gGraphicsProgramLogFilter, Debug::Verbose, "Log: %s\n", output);
+    DALI_LOG_ERROR("glLinkProgam failed:\n%s\n", output);
     gl->DeleteProgram(program);
     return false;
   }
@@ -172,8 +172,8 @@ bool ProgramImpl::Create()
   mImpl->glProgram = program;
 
   // Initialize reflection
-  mImpl->reflection->BuildUniformBlockReflection();
   mImpl->reflection->BuildVertexAttributeReflection();
+  mImpl->reflection->BuildUniformBlockReflection();
 
   // populate uniform cache memory for standalone uniforms (it's not needed
   // for real UBOs as real UBOs work with whole memory blocks)

diff --git a/dali/internal/graphics/gles-impl/gles-graphics-shader.cpp b/dali/internal/graphics/gles-impl/gles-graphics-shader.cpp
index e8eb2c8..5e46e97 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles-graphics-shader.cpp
+++ b/dali/internal/graphics/gles-impl/gles-graphics-shader.cpp
@@ -116,13 +116,11 @@ bool Shader::Compile() const
         char    output[4096];
         GLsizei size{0u};
         gl->GetShaderInfoLog(shader, 4096, &size, output);
-        DALI_LOG_RENDER_INFO("Code: %s\n", reinterpret_cast<const char*>(GetCreateInfo().sourceData));
-        DALI_LOG_RENDER_INFO("Log: %s\n", output);
+        DALI_LOG_ERROR("Code: %s\n", reinterpret_cast<const char*>(GetCreateInfo().sourceData));
+        DALI_LOG_ERROR("glCompileShader() failed: \n%s\n", output);
         gl->DeleteShader(shader);
         return false;
       }
-
-      // TODO: check error
       mImpl->glShader = shader;
     }
     return true;