From 15d2b477988fcf47cb0a3aded321b4997785bcc2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 24 Apr 2019 20:30:35 +0200 Subject: [PATCH] - fixed: RenderCommand::isCompatible failed to properly compare the SpecialColormap. This resulted in always returning 'false' which prevented merging line draws, ultimately crashing the Vulkan renderer on a buffer overflow. --- src/rendering/2d/v_2ddrawer.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rendering/2d/v_2ddrawer.h b/src/rendering/2d/v_2ddrawer.h index b9c663227..57fa88acf 100644 --- a/src/rendering/2d/v_2ddrawer.h +++ b/src/rendering/2d/v_2ddrawer.h @@ -105,13 +105,14 @@ public: return mTexture == other.mTexture && mType == other.mType && mTranslation == other.mTranslation && - mSpecialColormap == other.mSpecialColormap && + mSpecialColormap[0].d == other.mSpecialColormap[0].d && + mSpecialColormap[1].d == other.mSpecialColormap[1].d && !memcmp(mScissor, other.mScissor, sizeof(mScissor)) && mDesaturate == other.mDesaturate && mRenderStyle == other.mRenderStyle && mDrawMode == other.mDrawMode && mFlags == other.mFlags && - mColor1 == other.mColor1; + mColor1.d == other.mColor1.d; } };