summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_util.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 10239c8a7..a0eb0418c 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -29,10 +29,9 @@ GLuint LoadShaders(const char* vertex_shader, const char* fragment_shader) {
29 glGetShaderiv(vertex_shader_id, GL_COMPILE_STATUS, &result); 29 glGetShaderiv(vertex_shader_id, GL_COMPILE_STATUS, &result);
30 glGetShaderiv(vertex_shader_id, GL_INFO_LOG_LENGTH, &info_log_length); 30 glGetShaderiv(vertex_shader_id, GL_INFO_LOG_LENGTH, &info_log_length);
31 31
32 std::vector<char> vertex_shader_error(info_log_length);
33 glGetShaderInfoLog(vertex_shader_id, info_log_length, NULL, &vertex_shader_error[0]);
34
35 if (info_log_length > 1) { 32 if (info_log_length > 1) {
33 std::vector<char> vertex_shader_error(info_log_length);
34 glGetShaderInfoLog(vertex_shader_id, info_log_length, NULL, &vertex_shader_error[0]);
36 DEBUG_LOG(GPU, "%s", &vertex_shader_error[0]); 35 DEBUG_LOG(GPU, "%s", &vertex_shader_error[0]);
37 } 36 }
38 37
@@ -46,10 +45,9 @@ GLuint LoadShaders(const char* vertex_shader, const char* fragment_shader) {
46 glGetShaderiv(fragment_shader_id, GL_COMPILE_STATUS, &result); 45 glGetShaderiv(fragment_shader_id, GL_COMPILE_STATUS, &result);
47 glGetShaderiv(fragment_shader_id, GL_INFO_LOG_LENGTH, &info_log_length); 46 glGetShaderiv(fragment_shader_id, GL_INFO_LOG_LENGTH, &info_log_length);
48 47
49 std::vector<char> fragment_shader_error(info_log_length);
50 glGetShaderInfoLog(fragment_shader_id, info_log_length, NULL, &fragment_shader_error[0]);
51
52 if (info_log_length > 1) { 48 if (info_log_length > 1) {
49 std::vector<char> fragment_shader_error(info_log_length);
50 glGetShaderInfoLog(fragment_shader_id, info_log_length, NULL, &fragment_shader_error[0]);
53 DEBUG_LOG(GPU, "%s", &fragment_shader_error[0]); 51 DEBUG_LOG(GPU, "%s", &fragment_shader_error[0]);
54 } 52 }
55 53
@@ -65,10 +63,9 @@ GLuint LoadShaders(const char* vertex_shader, const char* fragment_shader) {
65 glGetProgramiv(program_id, GL_LINK_STATUS, &result); 63 glGetProgramiv(program_id, GL_LINK_STATUS, &result);
66 glGetProgramiv(program_id, GL_INFO_LOG_LENGTH, &info_log_length); 64 glGetProgramiv(program_id, GL_INFO_LOG_LENGTH, &info_log_length);
67 65
68 std::vector<char> program_error(std::max(info_log_length, int(1)));
69 glGetProgramInfoLog(program_id, info_log_length, NULL, &program_error[0]);
70
71 if (info_log_length > 1) { 66 if (info_log_length > 1) {
67 std::vector<char> program_error(info_log_length);
68 glGetProgramInfoLog(program_id, info_log_length, NULL, &program_error[0]);
72 DEBUG_LOG(GPU, "%s", &program_error[0]); 69 DEBUG_LOG(GPU, "%s", &program_error[0]);
73 } 70 }
74 71