summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-01-19 12:56:40 -0500
committerGitHub <noreply@github.com>2019-01-19 12:56:40 -0500
commit966405d64b014d15c8d5266238307754eceec23f (patch)
tree8d739490e8f5adea133ae6bc12f91cb69ef4afbe
parentd0e4e43e3ccbc512abc6593eff4d92e5aa08becb (diff)
parenta1b1ea47ed22cc716243738023da2b6ceb2f7a46 (diff)
Merge pull request #2033 from ReinUsesLisp/fixup-clip-warning
gl_rasterizer: Silent unsafe mix warning
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 73567eb8c..27d259f51 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -365,7 +365,7 @@ void RasterizerOpenGL::SetupShaders(GLenum primitive_mode) {
// (sometimes it's half the screen, sometimes three quarters). To avoid this, enable the
// clip distances only when it's written by a shader stage.
for (std::size_t i = 0; i < Maxwell::NumClipDistances; ++i) {
- clip_distances[i] |= shader->GetShaderEntries().clip_distances[i];
+ clip_distances[i] = clip_distances[i] || shader->GetShaderEntries().clip_distances[i];
}
// When VertexA is enabled, we have dual vertex shaders