From ebc55f8083fa3659f1b826b46109a7dfe71b7d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Tue, 31 Mar 2020 18:52:02 -0700 Subject: [PATCH] Cleanup. --- src/renderer_gl.cpp | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 78f93ffcd..3de91a1cc 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -7273,22 +7273,22 @@ namespace bgfx { namespace gl } if ( (0 - | BGFX_STATE_CULL_MASK - | BGFX_STATE_WRITE_Z - | BGFX_STATE_DEPTH_TEST_MASK - | BGFX_STATE_WRITE_RGB - | BGFX_STATE_WRITE_A - | BGFX_STATE_BLEND_MASK - | BGFX_STATE_BLEND_EQUATION_MASK | BGFX_STATE_ALPHA_REF_MASK | BGFX_STATE_BLEND_ALPHA_TO_COVERAGE + | BGFX_STATE_BLEND_EQUATION_MASK | BGFX_STATE_BLEND_INDEPENDENT - | BGFX_STATE_PT_MASK - | BGFX_STATE_POINT_SIZE_MASK - | BGFX_STATE_MSAA - | BGFX_STATE_LINEAA + | BGFX_STATE_BLEND_MASK | BGFX_STATE_CONSERVATIVE_RASTER + | BGFX_STATE_CULL_MASK + | BGFX_STATE_DEPTH_TEST_MASK | BGFX_STATE_FRONT_CCW + | BGFX_STATE_LINEAA + | BGFX_STATE_MSAA + | BGFX_STATE_POINT_SIZE_MASK + | BGFX_STATE_PT_MASK + | BGFX_STATE_WRITE_A + | BGFX_STATE_WRITE_RGB + | BGFX_STATE_WRITE_Z ) & changedFlags) { if (BGFX_STATE_FRONT_CCW & changedFlags) @@ -7392,10 +7392,10 @@ namespace bgfx { namespace gl } if ( ( (0 - | BGFX_STATE_BLEND_MASK + | BGFX_STATE_BLEND_ALPHA_TO_COVERAGE | BGFX_STATE_BLEND_EQUATION_MASK | BGFX_STATE_BLEND_INDEPENDENT - | BGFX_STATE_BLEND_ALPHA_TO_COVERAGE + | BGFX_STATE_BLEND_MASK ) & changedFlags) || blendFactor != draw.m_rgba) { @@ -7412,9 +7412,10 @@ namespace bgfx { namespace gl } if ( ( (0 - | BGFX_STATE_BLEND_MASK | BGFX_STATE_BLEND_EQUATION_MASK - | BGFX_STATE_BLEND_INDEPENDENT) & newFlags) + | BGFX_STATE_BLEND_INDEPENDENT + | BGFX_STATE_BLEND_MASK + ) & newFlags) || blendFactor != draw.m_rgba) { const bool enabled = !!(BGFX_STATE_BLEND_MASK & newFlags);