Reviewed UWP branch integration

12 files changed, 15 insertions, 58 deletions

diff --git a/src/external/include/ANGLE/EGL/egl.h b/src/external/ANGLE/EGL/egl.h
index 5a272912..5a272912 100644
--- a/src/external/include/ANGLE/EGL/egl.h
+++ b/src/external/ANGLE/EGL/egl.h
diff --git a/src/external/include/ANGLE/EGL/eglext.h b/src/external/ANGLE/EGL/eglext.h
index 0325ef10..0325ef10 100644
--- a/src/external/include/ANGLE/EGL/eglext.h
+++ b/src/external/ANGLE/EGL/eglext.h
diff --git a/src/external/include/ANGLE/EGL/eglplatform.h b/src/external/ANGLE/EGL/eglplatform.h
index eb3ea70c..eb3ea70c 100644
--- a/src/external/include/ANGLE/EGL/eglplatform.h
+++ b/src/external/ANGLE/EGL/eglplatform.h
diff --git a/src/external/include/ANGLE/GLES2/gl2.h b/src/external/ANGLE/GLES2/gl2.h
index c2d83572..c2d83572 100644
--- a/src/external/include/ANGLE/GLES2/gl2.h
+++ b/src/external/ANGLE/GLES2/gl2.h
diff --git a/src/external/include/ANGLE/GLES2/gl2ext.h b/src/external/ANGLE/GLES2/gl2ext.h
index d77fdbae..d77fdbae 100644
--- a/src/external/include/ANGLE/GLES2/gl2ext.h
+++ b/src/external/ANGLE/GLES2/gl2ext.h
diff --git a/src/external/include/ANGLE/GLES2/gl2platform.h b/src/external/ANGLE/GLES2/gl2platform.h
index c9fa3c4d..c9fa3c4d 100644
--- a/src/external/include/ANGLE/GLES2/gl2platform.h
+++ b/src/external/ANGLE/GLES2/gl2platform.h
diff --git a/src/external/include/ANGLE/GLES3/gl3.h b/src/external/ANGLE/GLES3/gl3.h
index 9c79862c..9c79862c 100644
--- a/src/external/include/ANGLE/GLES3/gl3.h
+++ b/src/external/ANGLE/GLES3/gl3.h
diff --git a/src/external/include/ANGLE/GLES3/gl3ext.h b/src/external/ANGLE/GLES3/gl3ext.h
index 4d4ea96c..4d4ea96c 100644
--- a/src/external/include/ANGLE/GLES3/gl3ext.h
+++ b/src/external/ANGLE/GLES3/gl3ext.h
diff --git a/src/external/include/ANGLE/GLES3/gl3platform.h b/src/external/ANGLE/GLES3/gl3platform.h
index 1bd1a850..1bd1a850 100644
--- a/src/external/include/ANGLE/GLES3/gl3platform.h
+++ b/src/external/ANGLE/GLES3/gl3platform.h
diff --git a/src/external/include/ANGLE/KHR/khrplatform.h b/src/external/ANGLE/KHR/khrplatform.h
index c9e6f17d..c9e6f17d 100644
--- a/src/external/include/ANGLE/KHR/khrplatform.h
+++ b/src/external/ANGLE/KHR/khrplatform.h
diff --git a/src/external/include/ANGLE/angle_windowsstore.h b/src/external/ANGLE/angle_windowsstore.h
index 25eadaca..25eadaca 100644
--- a/src/external/include/ANGLE/angle_windowsstore.h
+++ b/src/external/ANGLE/angle_windowsstore.h
diff --git a/src/rlgl.c b/src/rlgl.c
index f375b4a9..d94edd7f 100644
--- a/src/rlgl.c
+++ b/src/rlgl.c
@@ -1166,7 +1166,7 @@ void rlglInit(int width, int height)
         if(strcmp(extList[i], (const char *)"GL_EXT_debug_marker") == 0) debugMarkerSupported = true;
     }
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
     //free(extList);
 #endif
 
@@ -2407,10 +2407,6 @@ Shader LoadShader(char *vsFileName, char *fsFileName)
     for (int i = 0; i < MAX_SHADER_LOCATIONS; i++) shader.locs[i] = -1;
 
 #if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
-    // Shaders loading from external text file
-    char *vShaderStr = LoadText(vsFileName);
-    char *fShaderStr = LoadText(fsFileName);
-
     unsigned int vertexShaderId = defaultVShaderId;
     unsigned int fragmentShaderId = defaultFShaderId;
 
@@ -3181,82 +3177,46 @@ void EndVrDrawing(void)
 // Compile custom shader and return shader id
 static unsigned int CompileShader(const char *shaderStr, int type)
 {
-    unsigned int program = 0;
-
-#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
-    GLuint vertexShader;
-    GLuint fragmentShader;
-
-    vertexShader = glCreateShader(GL_VERTEX_SHADER);
-    fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
-
-    const char *pvs = vShaderStr;
-    const char *pfs = fShaderStr;
-
-    glShaderSource(vertexShader, 1, &pvs, NULL);
-    glShaderSource(fragmentShader, 1, &pfs, NULL);
+    unsigned int shader = glCreateShader(type);
+    glShaderSource(shader, 1, &shaderStr, NULL);
 
     GLint success = 0;
-
-    glCompileShader(vertexShader);
-
-    glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &success);
+    glCompileShader(shader);
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
 
     if (success != GL_TRUE)
     {
-        TraceLog(LOG_WARNING, "[VSHDR ID %i] Failed to compile vertex shader...", vertexShader);
-
+        TraceLog(LOG_WARNING, "[SHDR ID %i] Failed to compile shader...", shader);
         int maxLength = 0;
         int length;
+        glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &maxLength);
 
-        glGetShaderiv(vertexShader, GL_INFO_LOG_LENGTH, &maxLength);
-
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
         char *log = malloc(maxLength);
 #else
         char log[maxLength];
 #endif
-        glGetShaderInfoLog(vertexShader, maxLength, &length, log);
+        glGetShaderInfoLog(shader, maxLength, &length, log);
 
         TraceLog(LOG_INFO, "%s", log);
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
         free(log);
 #endif
     }
-    else TraceLog(LOG_INFO, "[VSHDR ID %i] Vertex shader compiled successfully", vertexShader);
+    else TraceLog(LOG_INFO, "[SHDR ID %i] Shader compiled successfully", shader);
 
-    glCompileShader(fragmentShader);
+    return shader;
+}
 
 // Load custom shader strings and return program id
 static unsigned int LoadShaderProgram(unsigned int vShaderId, unsigned int fShaderId)
 {
     unsigned int program = 0;
 
-    if (success != GL_TRUE)
-    {
-        TraceLog(LOG_WARNING, "[FSHDR ID %i] Failed to compile fragment shader...", fragmentShader);
-
-        int maxLength = 0;
-        int length;
-
-        glGetShaderiv(fragmentShader, GL_INFO_LOG_LENGTH, &maxLength);
-
-#ifdef _MSC_VER
-        char *log = malloc(maxLength);
-#else
-        char log[maxLength];
-#endif
-        glGetShaderInfoLog(fragmentShader, maxLength, &length, log);
-
-        TraceLog(LOG_INFO, "%s", log);
-
-#ifdef _MSC_VER
-        free(log);
-#endif
-    }
-    else TraceLog(LOG_INFO, "[FSHDR ID %i] Fragment shader compiled successfully", fragmentShader);
+#if defined(GRAPHICS_API_OPENGL_33) || defined(GRAPHICS_API_OPENGL_ES2)
 
+    GLint success = 0;
     program = glCreateProgram();
 
     glAttachShader(program, vShaderId);
@@ -3304,9 +3264,6 @@ static unsigned int LoadShaderProgram(unsigned int vShaderId, unsigned int fShad
         program = 0;
     }
     else TraceLog(LOG_INFO, "[SHDR ID %i] Shader program loaded successfully", program);
-
-    glDeleteShader(vertexShader);
-    glDeleteShader(fragmentShader);
 #endif
     return program;
 }