From 125f01f1f4aee60610449a9854638111497d2fd0 Mon Sep 17 00:00:00 2001 From: ghassanpl Date: Tue, 15 Sep 2015 12:10:06 +0200 Subject: [PATCH] * Changes to make it compile on Visual Studio 2015 --- src/models.c | 2 +- src/rlgl.c | 16 ++++++++++++---- src/text.c | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) mode change 100644 => 100755 src/models.c mode change 100644 => 100755 src/rlgl.c mode change 100644 => 100755 src/text.c diff --git a/src/models.c b/src/models.c old mode 100644 new mode 100755 index 4943aa5ef..4a328dfba --- a/src/models.c +++ b/src/models.c @@ -1589,7 +1589,7 @@ static float GetHeightValue(Color pixel) // Load OBJ mesh data static VertexData LoadOBJ(const char *fileName) { - VertexData vData; + VertexData vData = { 0 }; char dataType; char comments[200]; diff --git a/src/rlgl.c b/src/rlgl.c old mode 100644 new mode 100755 index ec23e9885..ff45686c6 --- a/src/rlgl.c +++ b/src/rlgl.c @@ -933,7 +933,7 @@ void rlglInit(void) // NOTE: We don't need to check again supported extensions but we do (in case GLEW is replaced sometime) // We get a list of available extensions and we check for some of them (compressed textures) glGetIntegerv(GL_NUM_EXTENSIONS, &numExt); - const char *extList[numExt]; + const char **extList = calloc(numExt, sizeof(const char *)); for (int i = 0; i < numExt; i++) extList[i] = (char *)glGetStringi(GL_EXTENSIONS, i); @@ -1020,6 +1020,8 @@ void rlglInit(void) if (texCompPVRTSupported) TraceLog(INFO, "[EXTENSION] PVRT compressed textures supported"); if (texCompASTCSupported) TraceLog(INFO, "[EXTENSION] ASTC compressed textures supported"); + free(extList); + // Initialize buffers, default shaders and default textures //---------------------------------------------------------- @@ -2148,11 +2150,13 @@ unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr) glGetShaderiv(vertexShader, GL_INFO_LOG_LENGTH, &maxLength); - char log[maxLength]; + char *log = calloc(maxLength, sizeof(char)); glGetShaderInfoLog(vertexShader, maxLength, &length, log); TraceLog(INFO, "%s", log); + + free(log); } else TraceLog(INFO, "[VSHDR ID %i] Vertex shader compiled successfully", vertexShader); @@ -2169,11 +2173,13 @@ unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr) glGetShaderiv(fragmentShader, GL_INFO_LOG_LENGTH, &maxLength); - char log[maxLength]; + char *log = calloc(maxLength, sizeof(char)); glGetShaderInfoLog(fragmentShader, maxLength, &length, log); TraceLog(INFO, "%s", log); + + free(log); } else TraceLog(INFO, "[FSHDR ID %i] Fragment shader compiled successfully", fragmentShader); @@ -2197,7 +2203,7 @@ unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr) glGetProgramiv(program, GL_INFO_LOG_LENGTH, &maxLength); - char log[maxLength]; + char *log = calloc(maxLength, sizeof(char)); glGetProgramInfoLog(program, maxLength, &length, log); @@ -2206,6 +2212,8 @@ unsigned int LoadShaderProgram(char *vShaderStr, char *fShaderStr) glDeleteProgram(program); program = 0; + + free(log); } else TraceLog(INFO, "[SHDR ID %i] Shader program loaded successfully", program); diff --git a/src/text.c b/src/text.c old mode 100644 new mode 100755 index 35a5f0494..1d21f0028 --- a/src/text.c +++ b/src/text.c @@ -633,7 +633,7 @@ static SpriteFont LoadTTF(const char *fileName, int fontSize) // 1) Generate sprite sheet image with characters from TTF // 2) Load image as SpriteFont - SpriteFont font; + SpriteFont font = { 0 }; Image image; image.width = 512;