summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Jannik Vogel2016-12-04 12:44:29 +0100
committerGravatar Jannik Vogel2016-12-05 21:11:24 +0100
commit0edc98686115ccfafc6b496eae44b5f24a9627a4 (patch)
tree7dc407bccb681438c899ad3eaec9f0453e96cb3e /src/video_core
parentMerge pull request #2200 from j-selby/fix-mingw-crash (diff)
downloadyuzu-0edc98686115ccfafc6b496eae44b5f24a9627a4.tar.gz
yuzu-0edc98686115ccfafc6b496eae44b5f24a9627a4.tar.xz
yuzu-0edc98686115ccfafc6b496eae44b5f24a9627a4.zip
Print broken shader code to log
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_util.cpp12
1 files 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) {
31 if (info_log_length > 1) { 31 if (info_log_length > 1) {
32 std::vector<char> vertex_shader_error(info_log_length); 32 std::vector<char> vertex_shader_error(info_log_length);
33 glGetShaderInfoLog(vertex_shader_id, info_log_length, nullptr, &vertex_shader_error[0]); 33 glGetShaderInfoLog(vertex_shader_id, info_log_length, nullptr, &vertex_shader_error[0]);
34 if (result) { 34 if (result == GL_TRUE) {
35 LOG_DEBUG(Render_OpenGL, "%s", &vertex_shader_error[0]); 35 LOG_DEBUG(Render_OpenGL, "%s", &vertex_shader_error[0]);
36 } else { 36 } else {
37 LOG_ERROR(Render_OpenGL, "Error compiling vertex shader:\n%s", &vertex_shader_error[0]); 37 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) {
51 if (info_log_length > 1) { 51 if (info_log_length > 1) {
52 std::vector<char> fragment_shader_error(info_log_length); 52 std::vector<char> fragment_shader_error(info_log_length);
53 glGetShaderInfoLog(fragment_shader_id, info_log_length, nullptr, &fragment_shader_error[0]); 53 glGetShaderInfoLog(fragment_shader_id, info_log_length, nullptr, &fragment_shader_error[0]);
54 if (result) { 54 if (result == GL_TRUE) {
55 LOG_DEBUG(Render_OpenGL, "%s", &fragment_shader_error[0]); 55 LOG_DEBUG(Render_OpenGL, "%s", &fragment_shader_error[0]);
56 } else { 56 } else {
57 LOG_ERROR(Render_OpenGL, "Error compiling fragment shader:\n%s", 57 LOG_ERROR(Render_OpenGL, "Error compiling fragment shader:\n%s",
@@ -75,13 +75,19 @@ GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader) {
75 if (info_log_length > 1) { 75 if (info_log_length > 1) {
76 std::vector<char> program_error(info_log_length); 76 std::vector<char> program_error(info_log_length);
77 glGetProgramInfoLog(program_id, info_log_length, nullptr, &program_error[0]); 77 glGetProgramInfoLog(program_id, info_log_length, nullptr, &program_error[0]);
78 if (result) { 78 if (result == GL_TRUE) {
79 LOG_DEBUG(Render_OpenGL, "%s", &program_error[0]); 79 LOG_DEBUG(Render_OpenGL, "%s", &program_error[0]);
80 } else { 80 } else {
81 LOG_ERROR(Render_OpenGL, "Error linking shader:\n%s", &program_error[0]); 81 LOG_ERROR(Render_OpenGL, "Error linking shader:\n%s", &program_error[0]);
82 } 82 }
83 } 83 }
84 84
85 // If the program linking failed at least one of the shaders was probably bad
86 if (result == GL_FALSE) {
87 LOG_ERROR(Render_OpenGL, "Vertex shader:\n%s", vertex_shader);
88 LOG_ERROR(Render_OpenGL, "Fragment shader:\n%s", fragment_shader);
89 }
90
85 glDeleteShader(vertex_shader_id); 91 glDeleteShader(vertex_shader_id);
86 glDeleteShader(fragment_shader_id); 92 glDeleteShader(fragment_shader_id);
87 93