From 94a1fdc2ae47c29661d9de92a5828b2f0c68d2b7 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 1 Sep 2015 23:15:26 +0200 Subject: Updated some comments --- src/rlgl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/rlgl.c') diff --git a/src/rlgl.c b/src/rlgl.c index 8806b429..d9d28ea1 100644 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -2019,6 +2019,8 @@ void *rlglReadTexturePixels(unsigned int textureId, unsigned int format) Shader LoadShader(char *vsFileName, char *fsFileName) { Shader shader; + + shader.id = 0; // Default value in case of loading failure #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2) // Shaders loading from external text file @@ -2180,9 +2182,11 @@ unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr) // Unload a custom shader from memory void UnloadShader(Shader shader) { - rlDeleteShader(shader.id); - - TraceLog(INFO, "[SHDR ID %i] Unloaded shader program data", shader.id); + if (shader.id != 0) + { + rlDeleteShader(shader.id); + TraceLog(INFO, "[SHDR ID %i] Unloaded shader program data", shader.id); + } } // Set custom shader to be used on batch draw @@ -2242,7 +2246,7 @@ void SetPostproShader(Shader shader) //TraceLog(DEBUG, "Postproquad shader diffuse map id: %i", postproQuad.shader.texDiffuseId); //TraceLog(DEBUG, "Shader diffuse map id: %i", shader.texDiffuseId); #elif defined(GRAPHICS_API_OPENGL_11) - TraceLog(WARNING, "Postprocessing shaders not supported on OpenGL 1.1"); + TraceLog(WARNING, "Shaders not supported on OpenGL 1.1"); #endif } @@ -2287,6 +2291,8 @@ void SetModelShader(Model *model, Shader shader) // NOTE: If SetModelTexture() is called previously, texture is not assigned to new shader if (model->texture.id > 0) model->shader.texDiffuseId = model->texture.id; +#elif (GRAPHICS_API_OPENGL_11) + TraceLog(WARNING, "Shaders not supported on OpenGL 1.1"); #endif } -- cgit v1.2.3