summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-12-26 20:38:39 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-12-26 20:38:49 +0100
commit5b989f189fbf30535f5509a2157dc755fcb4d8f0 (patch)
treec0b96b4e098e1cb4b51ad5b04bf7686e33cb5545
parentMerge pull request #3244 from ReinUsesLisp/vk-fps (diff)
downloadyuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.tar
yuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.tar.gz
yuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.tar.bz2
yuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.tar.lz
yuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.tar.xz
yuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.tar.zst
yuzu-5b989f189fbf30535f5509a2157dc755fcb4d8f0.zip
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_shader_manager.h4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index dbb08dd80..672051102 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -271,6 +271,9 @@ void RasterizerOpenGL::SetupShaders(GLenum primitive_mode) {
case Maxwell::ShaderProgram::Geometry:
shader_program_manager->UseTrivialGeometryShader();
break;
+ case Maxwell::ShaderProgram::Fragment:
+ shader_program_manager->UseTrivialFragmentShader();
+ break;
default:
break;
}
diff --git a/src/video_core/renderer_opengl/gl_shader_manager.h b/src/video_core/renderer_opengl/gl_shader_manager.h
index 3703e7018..478c165ce 100644
--- a/src/video_core/renderer_opengl/gl_shader_manager.h
+++ b/src/video_core/renderer_opengl/gl_shader_manager.h
@@ -50,6 +50,10 @@ public:
current_state.geometry_shader = 0;
}
+ void UseTrivialFragmentShader() {
+ current_state.fragment_shader = 0;
+ }
+
private:
struct PipelineState {
bool operator==(const PipelineState& rhs) const {