Explorar o código

astc: Make IntegerEncodedValue trivially copyable

ReinUsesLisp %!s(int64=6) %!d(string=hai) anos
pai
achega
5ed377b989
Modificáronse 1 ficheiros con 2 adicións e 9 borrados
  1. 2 9
      src/video_core/textures/astc.cpp

+ 2 - 9
src/video_core/textures/astc.cpp

@@ -162,8 +162,8 @@ enum class IntegerEncoding { JustBits, Qus32, Trit };
 
 
 class IntegerEncodedValue {
 class IntegerEncodedValue {
 private:
 private:
-    const IntegerEncoding m_Encoding;
-    const u32 m_NumBits;
+    IntegerEncoding m_Encoding;
+    u32 m_NumBits;
     u32 m_BitValue;
     u32 m_BitValue;
     union {
     union {
         u32 m_Qus32Value;
         u32 m_Qus32Value;
@@ -171,13 +171,6 @@ private:
     };
     };
 
 
 public:
 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)
     IntegerEncodedValue(IntegerEncoding encoding, u32 numBits)
         : m_Encoding(encoding), m_NumBits(numBits) {}
         : m_Encoding(encoding), m_NumBits(numBits) {}