diff options
| author |  bunnei | 2019-01-19 12:56:40 -0500 |
|---|---|---|
| committer |  GitHub | 2019-01-19 12:56:40 -0500 |
| commit | 966405d64b014d15c8d5266238307754eceec23f (patch) | |
| tree | 8d739490e8f5adea133ae6bc12f91cb69ef4afbe /src | |
| parent | Merge pull request #2036 from lioncash/unused-class (diff) | |
| parent | gl_rasterizer: Silent unsafe mix warning (diff) | |
| download | yuzu-966405d64b014d15c8d5266238307754eceec23f.tar.gz yuzu-966405d64b014d15c8d5266238307754eceec23f.tar.xz yuzu-966405d64b014d15c8d5266238307754eceec23f.zip | |
Merge pull request #2033 from ReinUsesLisp/fixup-clip-warning
gl_rasterizer: Silent unsafe mix warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 |
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) { | |||
| 365 | // (sometimes it's half the screen, sometimes three quarters). To avoid this, enable the | 365 | // (sometimes it's half the screen, sometimes three quarters). To avoid this, enable the |
| 366 | // clip distances only when it's written by a shader stage. | 366 | // clip distances only when it's written by a shader stage. |
| 367 | for (std::size_t i = 0; i < Maxwell::NumClipDistances; ++i) { | 367 | for (std::size_t i = 0; i < Maxwell::NumClipDistances; ++i) { |
| 368 | clip_distances[i] |= shader->GetShaderEntries().clip_distances[i]; | 368 | clip_distances[i] = clip_distances[i] || shader->GetShaderEntries().clip_distances[i]; |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | // When VertexA is enabled, we have dual vertex shaders | 371 | // When VertexA is enabled, we have dual vertex shaders |