From 97aa1427e27d84cf1607a3198ad81b16a5a5acc3 Mon Sep 17 00:00:00 2001 From: Francisco Santos Date: Thu, 15 Jan 2015 11:46:54 +0000 Subject: [PATCH] Cleanup shader compilation errors. Change-Id: I5d2d3cf0b9cf375b743763b31ce46ecd50ba65ff --- dali/internal/render/shaders/program.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dali/internal/render/shaders/program.cpp b/dali/internal/render/shaders/program.cpp index 1ef2600..3a47253 100644 --- a/dali/internal/render/shaders/program.cpp +++ b/dali/internal/render/shaders/program.cpp @@ -593,7 +593,7 @@ bool Program::CompileShader( GLenum shaderType, GLuint& shaderId, const char* sr if(nLength > 0) { Dali::Vector< char > szLog; - szLog.Reserve( nLength ); + szLog.Resize( nLength ); mGlAbstraction.GetShaderInfoLog( shaderId, nLength, &nLength, szLog.Begin() ); DALI_LOG_ERROR( "Shader Compiler Error: %s\n", szLog.Begin() ); } @@ -617,18 +617,17 @@ void Program::Link() { DALI_LOG_ERROR("Shader failed to link \n"); - char* szLog = NULL; GLint nLength; mGlAbstraction.GetProgramiv( mProgramId, GL_INFO_LOG_LENGTH, &nLength); if(nLength > 0) { - szLog = new char[ nLength ]; - mGlAbstraction.GetProgramInfoLog( mProgramId, nLength, &nLength, szLog ); - DALI_LOG_ERROR( "Shader Link Error: %s\n", szLog ); - delete [] szLog; + Dali::Vector< char > szLog; + szLog.Resize( nLength ); + mGlAbstraction.GetProgramInfoLog( mProgramId, nLength, &nLength, szLog.Begin() ); + DALI_LOG_ERROR( "Shader Link Error: %s\n", szLog.Begin() ); } - DALI_ASSERT_DEBUG(0); + DALI_ASSERT_ALWAYS( 0 && "Shader linking failure" ); } mLinked = linked != GL_FALSE; -- 2.7.4