diff options
| author |  Lioncash | 2018-08-23 22:59:50 -0400 |
|---|---|---|
| committer | Lioncash | 2018-08-23 23:00:54 -0400 |
| commit | 8fd9eb71b489877b047a80e168e129484f892014 (patch) | |
| tree | 59697841063bfd2cb2de37c11dab75a20acb06ea /src | |
| parent | Port #4013 from Citra: "Init logging sooner so we dont miss some logs on star... (diff) | |
| download | yuzu-8fd9eb71b489877b047a80e168e129484f892014.tar.gz yuzu-8fd9eb71b489877b047a80e168e129484f892014.tar.xz yuzu-8fd9eb71b489877b047a80e168e129484f892014.zip | |
gl_rasterizer: Correct assertion condition in SyncLogicOpState()
Previously the assert would always be hit, since it was the equivalent
of: array == nullptr, which is never true.
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 | } |