summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-12-28 19:33:53 +0100
committerGitHub <noreply@github.com>2019-12-28 19:33:53 +0100
commitf846e3d6d0e973485a53bb87b913059060dcfdbc (patch)
tree03290de133397ceb727443865ef91a9e30f3093e /src/video_core
parentMerge pull request #3228 from ReinUsesLisp/ptp (diff)
parentgl_rasterizer: Allow rendering without fragment shader (diff)
downloadyuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.tar
yuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.tar.gz
yuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.tar.bz2
yuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.tar.lz
yuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.tar.xz
yuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.tar.zst
yuzu-f846e3d6d0e973485a53bb87b913059060dcfdbc.zip
Diffstat (limited to 'src/video_core')
-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 {