From 0edc98686115ccfafc6b496eae44b5f24a9627a4 Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Sun, 4 Dec 2016 12:44:29 +0100
Subject: [PATCH 1/3] Print broken shader code to log

---
 src/video_core/renderer_opengl/gl_shader_util.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index fe07aa6eb..9a7a39b95 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -31,7 +31,7 @@ GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader) {
     if (info_log_length > 1) {
         std::vector<char> vertex_shader_error(info_log_length);
         glGetShaderInfoLog(vertex_shader_id, info_log_length, nullptr, &vertex_shader_error[0]);
-        if (result) {
+        if (result == GL_TRUE) {
             LOG_DEBUG(Render_OpenGL, "%s", &vertex_shader_error[0]);
         } else {
             LOG_ERROR(Render_OpenGL, "Error compiling vertex shader:\n%s", &vertex_shader_error[0]);
@@ -51,7 +51,7 @@ GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader) {
     if (info_log_length > 1) {
         std::vector<char> fragment_shader_error(info_log_length);
         glGetShaderInfoLog(fragment_shader_id, info_log_length, nullptr, &fragment_shader_error[0]);
-        if (result) {
+        if (result == GL_TRUE) {
             LOG_DEBUG(Render_OpenGL, "%s", &fragment_shader_error[0]);
         } else {
             LOG_ERROR(Render_OpenGL, "Error compiling fragment shader:\n%s",
@@ -75,13 +75,19 @@ GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader) {
     if (info_log_length > 1) {
         std::vector<char> program_error(info_log_length);
         glGetProgramInfoLog(program_id, info_log_length, nullptr, &program_error[0]);
-        if (result) {
+        if (result == GL_TRUE) {
             LOG_DEBUG(Render_OpenGL, "%s", &program_error[0]);
         } else {
             LOG_ERROR(Render_OpenGL, "Error linking shader:\n%s", &program_error[0]);
         }
     }
 
+    // If the program linking failed at least one of the shaders was probably bad
+    if (result == GL_FALSE) {
+        LOG_ERROR(Render_OpenGL, "Vertex shader:\n%s", vertex_shader);
+        LOG_ERROR(Render_OpenGL, "Fragment shader:\n%s", fragment_shader);
+    }
+
     glDeleteShader(vertex_shader_id);
     glDeleteShader(fragment_shader_id);
 

From 4088afe23c8a109d84d97c9d1e7708606a9dfffe Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Sun, 4 Dec 2016 13:11:48 +0100
Subject: [PATCH 2/3] Report shader uniform block size in case of mismatch

---
 src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 3f2255e06..ba65db419 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -1083,7 +1083,9 @@ void RasterizerOpenGL::SetShader() {
         GLint block_size;
         glGetActiveUniformBlockiv(current_shader->shader.handle, block_index,
                                   GL_UNIFORM_BLOCK_DATA_SIZE, &block_size);
-        ASSERT_MSG(block_size == sizeof(UniformData), "Uniform block size did not match!");
+        ASSERT_MSG(block_size == sizeof(UniformData),
+                   "Uniform block size did not match! Got %d, expected %zu",
+                   static_cast<int>(block_size), sizeof(UniformData));
         glUniformBlockBinding(current_shader->shader.handle, block_index, 0);
 
         // Update uniforms

From fc4591fa4960d384ec39caa9a42f04f4bf4dd3c7 Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Mon, 5 Dec 2016 02:10:12 +0100
Subject: [PATCH 3/3] ASSERT that shader was linked successfully

---
 src/video_core/renderer_opengl/gl_shader_util.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 9a7a39b95..4da241d83 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -4,6 +4,7 @@
 
 #include <vector>
 #include <glad/glad.h>
+#include "common/assert.h"
 #include "common/logging/log.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 
@@ -87,6 +88,7 @@ GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader) {
         LOG_ERROR(Render_OpenGL, "Vertex shader:\n%s", vertex_shader);
         LOG_ERROR(Render_OpenGL, "Fragment shader:\n%s", fragment_shader);
     }
+    ASSERT_MSG(result == GL_TRUE, "Shader not linked");
 
     glDeleteShader(vertex_shader_id);
     glDeleteShader(fragment_shader_id);