From 970fc39d986c5eefa1c4b61ac89ef7e8c2bf23bf Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Mon, 7 Jun 2021 19:05:11 -0400
Subject: glsl: Rebase fixes

---
 src/video_core/renderer_opengl/gl_shader_cache.cpp | 1 -
 src/video_core/renderer_opengl/gl_shader_util.cpp  | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/video_core')

diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index b4c634d29..3d229a78c 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -225,7 +225,6 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo
           .support_derivative_control = device.HasDerivativeControl(),
           .support_gl_nv_gpu_shader_5 = device.HasNvGpuShader5(),
           .support_gl_amd_gpu_shader_half_float = device.HasAmdShaderHalfFloat(),
-          .support_gl_vertex_viewport_layer = device.HasVertexViewportLayer(),
           .support_gl_texture_shadow_lod = device.HasTextureShadowLod(),
 
           .warp_size_potentially_larger_than_guest = device.IsWarpSizePotentiallyLargerThanGuest(),
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 99cb81819..ac6f33e34 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -13,7 +13,7 @@
 
 namespace OpenGL {
 
-static void LogShader(GLuint shader) {
+static void LogShader(GLuint shader, std::optional<std::string_view> code = {}) {
     GLint shader_status{};
     glGetShaderiv(shader, GL_COMPILE_STATUS, &shader_status);
     if (shader_status == GL_FALSE) {
@@ -28,6 +28,9 @@ static void LogShader(GLuint shader) {
     glGetShaderInfoLog(shader, log_length, nullptr, log.data());
     if (shader_status == GL_FALSE) {
         LOG_ERROR(Render_OpenGL, "{}", log);
+        if (code.has_value()) {
+            LOG_INFO(Render_OpenGL, "\n{}", *code);
+        }
     } else {
         LOG_WARNING(Render_OpenGL, "{}", log);
     }
@@ -43,7 +46,7 @@ void AttachShader(GLenum stage, GLuint program, std::string_view code) {
     glCompileShader(shader.handle);
     glAttachShader(program, shader.handle);
     if (Settings::values.renderer_debug) {
-        LogShader(shader.handle);
+        LogShader(shader.handle, code);
     }
 }
 
-- 
cgit v1.2.3