octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl_shader_cache: Address CI issues

This commit is contained in:
ReinUsesLisp 2019-07-15 02:27:18 -03:00
parent 725ba6cf63
commit bbecd13697
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video_core/renderer_opengl/gl_shader_cache.cpp
View File

@ -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) { switch (program) {
case Maxwell::ShaderProgram::VertexA: case Maxwell::ShaderProgram::VertexA:
return ProgramType::VertexA; return ProgramType::VertexA;
@ -118,6 +118,7 @@ constexpr ProgramType GetProgramType(Maxwell::ShaderProgram program) {
return ProgramType::Fragment; return ProgramType::Fragment;
} }
UNREACHABLE(); UNREACHABLE();
return {};
} }
/// Calculates the size of a program stream /// Calculates the size of a program stream

3
src/video_core/renderer_opengl/gl_shader_gen.cpp
View File

@ -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); const ShaderIR program_ir(setup.program.code, PROGRAM_OFFSET, setup.program.size_a);
ProgramResult program = ProgramResult program = Decompile(device, program_ir, ProgramType::Geometry, "geometry");
Decompile(device, program_ir, ProgramType::Geometry, "geometry");
out += program.first; out += program.first;
out += R"( out += R"(