summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2019-07-15 02:27:18 -0300
committerGravatar ReinUsesLisp2019-07-15 17:38:25 -0300
commitbbecd13697f81e0ca21051098ac2d7fb6fdb9788 (patch)
tree68edfae9ae7f94a8a903c0568bab56ed2696fbe0 /src
parentgl_rasterizer: Implement compute shaders (diff)
downloadyuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.gz
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.xz
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.zip
gl_shader_cache: Address CI issues
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 7e95c2daa..2b30fb522 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -102,7 +102,7 @@ constexpr std::tuple<const char*, const char*, u32> GetPrimitiveDescription(GLen
102 } 102 }
103} 103}
104 104
105constexpr ProgramType GetProgramType(Maxwell::ShaderProgram program) { 105ProgramType GetProgramType(Maxwell::ShaderProgram program) {
106 switch (program) { 106 switch (program) {
107 case Maxwell::ShaderProgram::VertexA: 107 case Maxwell::ShaderProgram::VertexA:
108 return ProgramType::VertexA; 108 return ProgramType::VertexA;
@@ -118,6 +118,7 @@ constexpr ProgramType GetProgramType(Maxwell::ShaderProgram program) {
118 return ProgramType::Fragment; 118 return ProgramType::Fragment;
119 } 119 }
120 UNREACHABLE(); 120 UNREACHABLE();
121 return {};
121} 122}
122 123
123/// Calculates the size of a program stream 124/// Calculates the size of a program stream
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index de72570d6..3a8d9e1da 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -81,8 +81,7 @@ layout (std140, binding = EMULATION_UBO_BINDING) uniform gs_config {
81)"; 81)";
82 82
83 const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET, setup.program.size_a); 83 const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET, setup.program.size_a);
84 ProgramResult program = 84 ProgramResult program = Decompile(device, program_ir, ProgramType::Geometry, "geometry");
85 Decompile(device, program_ir, ProgramType::Geometry, "geometry");
86 out += program.first; 85 out += program.first;
87 86
88 out += R"( 87 out += R"(