Merge pull request #2033 from ReinUsesLisp/fixup-clip-warning

gl_rasterizer: Silent unsafe mix warning
merge-requests/60/head
bunnei 2019-01-19 12:56:40 +07:00 committed by GitHub
commit 966405d64b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

@ -365,7 +365,7 @@ void RasterizerOpenGL::SetupShaders(GLenum primitive_mode) {
// (sometimes it's half the screen, sometimes three quarters). To avoid this, enable the // (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. // clip distances only when it's written by a shader stage.
for (std::size_t i = 0; i < Maxwell::NumClipDistances; ++i) { 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 // When VertexA is enabled, we have dual vertex shaders