summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-07-15 07:27:18 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-07-15 22:38:25 +0200
commitbbecd13697f81e0ca21051098ac2d7fb6fdb9788 (patch)
tree68edfae9ae7f94a8a903c0568bab56ed2696fbe0
parentgl_rasterizer: Implement compute shaders (diff)
downloadyuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.gz
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.bz2
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.lz
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.xz
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.tar.zst
yuzu-bbecd13697f81e0ca21051098ac2d7fb6fdb9788.zip
-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
}
}
-constexpr ProgramType GetProgramType(Maxwell::ShaderProgram program) {
+ProgramType GetProgramType(Maxwell::ShaderProgram program) {
switch (program) {
case Maxwell::ShaderProgram::VertexA:
return ProgramType::VertexA;
@@ -118,6 +118,7 @@ constexpr ProgramType GetProgramType(Maxwell::ShaderProgram program) {
return ProgramType::Fragment;
}
UNREACHABLE();
+ return {};
}
/// 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 {
)";
const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET, setup.program.size_a);
- ProgramResult program =
- Decompile(device, program_ir, ProgramType::Geometry, "geometry");
+ ProgramResult program = Decompile(device, program_ir, ProgramType::Geometry, "geometry");
out += program.first;
out += R"(