Merge pull request #5297 from lioncash/missing

gl_rasterizer: Amend missing return value in branch in SetupGeometryShader()
This commit is contained in:
Pengfei Zhu 2020-05-02 08:07:49 +08:00 committed by GitHub
commit e212dc3a1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -389,12 +389,14 @@ bool RasterizerOpenGL::SetupVertexShader() {
bool RasterizerOpenGL::SetupGeometryShader() { bool RasterizerOpenGL::SetupGeometryShader() {
MICROPROFILE_SCOPE(OpenGL_GS); MICROPROFILE_SCOPE(OpenGL_GS);
const auto& regs = Pica::g_state.regs; const auto& regs = Pica::g_state.regs;
if (regs.pipeline.use_gs == Pica::PipelineRegs::UseGS::No) {
shader_program_manager->UseFixedGeometryShader(regs); if (regs.pipeline.use_gs != Pica::PipelineRegs::UseGS::No) {
return true;
} else {
LOG_ERROR(Render_OpenGL, "Accelerate draw doesn't support geometry shader"); LOG_ERROR(Render_OpenGL, "Accelerate draw doesn't support geometry shader");
return false;
} }
shader_program_manager->UseFixedGeometryShader(regs);
return true;
} }
bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) { bool RasterizerOpenGL::AccelerateDrawBatch(bool is_indexed) {