Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14965 from elloop/fix_opengl_log_function 

fix opengl log function.
This commit is contained in:
minggo 2016-04-18 18:32:00 +08:00
parent 5bd592ca34 341575aa4c
commit 93d331f1e8
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocos/renderer/CCGLProgram.cpp
View File

@ -587,17 +587,15 @@ void GLProgram::use()
static std::string logForOpenGLShader(GLuint shader) static std::string logForOpenGLShader(GLuint shader)
{ {
std::string ret; GLint logLength = 0;
GLint logLength = 0, charsWritten = 0;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength); glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
if (logLength < 1) if (logLength < 1)
return ""; return "";
char *logBytes = (char*)malloc(logLength + 1); char *logBytes = (char*)malloc(sizeof(char) * logLength);
glGetShaderInfoLog(shader, logLength, &charsWritten, logBytes); glGetShaderInfoLog(shader, logLength, nullptr, logBytes);
logBytes[logLength] = '\0'; std::string ret(logBytes);
ret = logBytes;
free(logBytes); free(logBytes);
return ret; return ret;
@ -605,17 +603,15 @@ static std::string logForOpenGLShader(GLuint shader)
static std::string logForOpenGLProgram(GLuint program) static std::string logForOpenGLProgram(GLuint program)
{ {
std::string ret; GLint logLength = 0;
GLint logLength = 0, charsWritten = 0;
glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength); glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
if (logLength < 1) if (logLength < 1)
return ""; return "";
char *logBytes = (char*)malloc(logLength + 1); char *logBytes = (char*)malloc(sizeof(char) * logLength);
glGetProgramInfoLog(program, logLength, &charsWritten, logBytes); glGetProgramInfoLog(program, logLength, nullptr, logBytes);
logBytes[logLength] = '\0'; std::string ret(logBytes);
ret = logBytes;
free(logBytes); free(logBytes);
return ret; return ret;