Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2019-06-19 12:09:04 -07:00
parent d4aac235fc 9e28737b57
commit 240e839600
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/OpenGLWindow/LoadShader.cpp
View File

@@ -44,7 +44,7 @@ GLuint gltLoadShaderPair(const char *szVertexProg, const char *szFragmentProg)
return 0; return 0;
glDeleteShader(hVertexShader); glDeleteShader(hVertexShader);
glDeleteShader(hFragmentShader); glDeleteShader(hFragmentShader);
return (GLuint)NULL; return (GLuint)0;
} }
assert(glGetError() == GL_NO_ERROR); assert(glGetError() == GL_NO_ERROR);
@@ -62,7 +62,7 @@ GLuint gltLoadShaderPair(const char *szVertexProg, const char *szFragmentProg)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
glDeleteShader(hVertexShader); glDeleteShader(hVertexShader);
glDeleteShader(hFragmentShader); glDeleteShader(hFragmentShader);
return (GLuint)NULL; return (GLuint)0;
} }
assert(glGetError() == GL_NO_ERROR); assert(glGetError() == GL_NO_ERROR);
@@ -96,7 +96,7 @@ GLuint gltLoadShaderPair(const char *szVertexProg, const char *szFragmentProg)
printf("Warning/Error in GLSL shader:\n"); printf("Warning/Error in GLSL shader:\n");
printf("%s\n", infoLog); printf("%s\n", infoLog);
glDeleteProgram(hReturn); glDeleteProgram(hReturn);
return (GLuint)NULL; return (GLuint)0;
} }
return hReturn; return hReturn;