From 5ed377b989b01141a65f02a0ae0a9ed52ce43346 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Fri, 13 Mar 2020 22:30:31 -0300 Subject: [PATCH] astc: Make IntegerEncodedValue trivially copyable --- src/video_core/textures/astc.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 7d5796794..02cbad1ea 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp @@ -162,8 +162,8 @@ enum class IntegerEncoding { JustBits, Qus32, Trit }; class IntegerEncodedValue { private: - const IntegerEncoding m_Encoding; - const u32 m_NumBits; + IntegerEncoding m_Encoding; + u32 m_NumBits; u32 m_BitValue; union { u32 m_Qus32Value; @@ -171,13 +171,6 @@ private: }; public: - // Jank, but we're not doing any heavy lifting in this class, so it's - // probably OK. It allows us to use these in std::vectors... - IntegerEncodedValue& operator=(const IntegerEncodedValue& other) { - new (this) IntegerEncodedValue(other); - return *this; - } - IntegerEncodedValue(IntegerEncoding encoding, u32 numBits) : m_Encoding(encoding), m_NumBits(numBits) {}