diff options
| author |  bunnei | 2018-08-25 10:50:59 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-25 10:50:59 -0400 |
| commit | 23b86fd3ea9e67b9135908c9228b23ebe0e60024 (patch) | |
| tree | 3ae3c7e9c779ab6706b1b0f67aa5b6a911255773 /src | |
| parent | Merge pull request #1166 from lioncash/typo (diff) | |
| parent | gl_rasterizer: Correct assertion condition in SyncLogicOpState() (diff) | |
| download | yuzu-23b86fd3ea9e67b9135908c9228b23ebe0e60024.tar.gz yuzu-23b86fd3ea9e67b9135908c9228b23ebe0e60024.tar.xz yuzu-23b86fd3ea9e67b9135908c9228b23ebe0e60024.zip | |
Merge pull request #1167 from lioncash/assert
gl_rasterizer: Correct assertion condition in SyncLogicOpState()
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 8bfa75b84..96851ccb5 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -929,7 +929,8 @@ void RasterizerOpenGL::SyncLogicOpState() { | |||
| 929 | if (!state.logic_op.enabled) | 929 | if (!state.logic_op.enabled) |
| 930 | return; | 930 | return; |
| 931 | 931 | ||
| 932 | ASSERT_MSG(regs.blend.enable == 0, "Blending and logic op can't be enabled at the same time."); | 932 | ASSERT_MSG(regs.blend.enable[0] == 0, |
| 933 | "Blending and logic op can't be enabled at the same time."); | ||
| 933 | 934 | ||
| 934 | state.logic_op.operation = MaxwellToGL::LogicOp(regs.logic_op.operation); | 935 | state.logic_op.operation = MaxwellToGL::LogicOp(regs.logic_op.operation); |
| 935 | } | 936 | } |