From 5de7c1ee030b55008b553b53694a6018bf9218c7 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 24 Apr 2023 22:45:19 +0200 Subject: [PATCH] Remove mClipSplit --- .../rendering/hwrenderer/data/hw_renderstate.h | 15 ++++++++------- src/common/rendering/vulkan/vk_renderstate.cpp | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/rendering/hwrenderer/data/hw_renderstate.h b/src/common/rendering/hwrenderer/data/hw_renderstate.h index 8bd19ff0f2..455c101f94 100644 --- a/src/common/rendering/hwrenderer/data/hw_renderstate.h +++ b/src/common/rendering/hwrenderer/data/hw_renderstate.h @@ -237,7 +237,6 @@ protected: int mLightMode = -1; float mAlphaThreshold; - float mClipSplit[2]; int mColorMapSpecial; @@ -655,24 +654,26 @@ public: void SetClipSplit(float bottom, float top) { - mClipSplit[0] = bottom; - mClipSplit[1] = top; + mStreamData.uClipSplit.X = bottom; + mStreamData.uClipSplit.Y = top; } void SetClipSplit(float *vals) { - memcpy(mClipSplit, vals, 2 * sizeof(float)); + mStreamData.uClipSplit.X = vals[0]; + mStreamData.uClipSplit.Y = vals[1]; } void GetClipSplit(float *out) { - memcpy(out, mClipSplit, 2 * sizeof(float)); + out[0] = mStreamData.uClipSplit.X; + out[1] = mStreamData.uClipSplit.Y; } void ClearClipSplit() { - mClipSplit[0] = -1000000.f; - mClipSplit[1] = 1000000.f; + mStreamData.uClipSplit.X = -1000000.f; + mStreamData.uClipSplit.Y = 1000000.f; } void SetVertexBuffer(IBuffer* vb, int offset0, int offset1) diff --git a/src/common/rendering/vulkan/vk_renderstate.cpp b/src/common/rendering/vulkan/vk_renderstate.cpp index c10e9b8d33..f21c2d2665 100644 --- a/src/common/rendering/vulkan/vk_renderstate.cpp +++ b/src/common/rendering/vulkan/vk_renderstate.cpp @@ -396,7 +396,6 @@ void VkRenderState::ApplyStreamData() mStreamData.timer = 0.0f; mStreamData.uAlphaThreshold = mAlphaThreshold; - mStreamData.uClipSplit = { mClipSplit[0], mClipSplit[1] }; if (mMaterial.mMaterial) {