diff options
| author | raysan5 <[email protected]> | 2017-07-17 12:02:46 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2017-07-17 12:02:46 +0200 |
| commit | e893f3629e85ec018955d188916c00c3c07c44c0 (patch) | |
| tree | 35f8675d22cdd8ca69e00c15dd8b3893c0855504 /src/rlgl.c | |
| parent | 6546474fa45234ed0a84f62be705d9a9aee43079 (diff) | |
| download | raylib-e893f3629e85ec018955d188916c00c3c07c44c0.tar.gz raylib-e893f3629e85ec018955d188916c00c3c07c44c0.zip | |
Corrected some issues
Diffstat (limited to 'src/rlgl.c')
| -rw-r--r-- | src/rlgl.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -338,7 +338,7 @@ static unsigned int LoadShaderProgram(const char *vShaderStr, const char *fShade static Shader LoadShaderDefault(void); // Load default shader (just vertex positioning and texture coloring) static void SetShaderDefaultLocations(Shader *shader); // Bind default shader locations (attributes and uniforms) -static void UnLoadShaderDefault(void); // Unload default shader +static void UnloadShaderDefault(void); // Unload default shader static void LoadDefaultBuffers(void); // Load default internal buffers (lines, triangles, quads) static void UpdateDefaultBuffers(void); // Update default internal buffers (VAOs/VBOs) with vertex data @@ -1532,7 +1532,7 @@ void rlUpdateTexture(unsigned int id, int width, int height, int format, const v case UNCOMPRESSED_R5G5B5A1: glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, (unsigned short *)data); break; case UNCOMPRESSED_R4G4B4A4: glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, (unsigned short *)data); break; case UNCOMPRESSED_R8G8B8A8: glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (unsigned char *)data); break; - default: TraceLog(WARNING, "Texture format updating not supported"); break; + default: TraceLog(LOG_WARNING, "Texture format updating not supported"); break; } #elif defined(GRAPHICS_API_OPENGL_11) || defined(GRAPHICS_API_OPENGL_ES2) // NOTE: on OpenGL ES 2.0 (WebGL), internalFormat must match format and options allowed are: GL_LUMINANCE, GL_RGB, GL_RGBA @@ -1545,7 +1545,7 @@ void rlUpdateTexture(unsigned int id, int width, int height, int format, const v case UNCOMPRESSED_R5G5B5A1: glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, (unsigned short *)data); break; case UNCOMPRESSED_R4G4B4A4: glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, (unsigned short *)data); break; case UNCOMPRESSED_R8G8B8A8: glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, (unsigned char *)data); break; - default: TraceLog(WARNING, "Texture format updating not supported"); break; + default: TraceLog(LOG_WARNING, "Texture format updating not supported"); break; } #endif } @@ -3454,7 +3454,7 @@ static Shader LoadShaderDefault(void) shader.locs[LOC_COLOR_DIFFUSE] = glGetUniformLocation(shader.id, "colDiffuse"); shader.locs[LOC_TEXMAP_DIFFUSE] = glGetUniformLocation(shader.id, "texture0"); } - else TraceLog(WARNING, "[SHDR ID %i] Default shader could not be loaded", shader.id); + else TraceLog(LOG_WARNING, "[SHDR ID %i] Default shader could not be loaded", shader.id); return shader; } |
