Merge branch 'feature/savestates-2' of https://github.com/hamish-milne/citra into feature/savestates-2

src/common/memory_ref.h

@@ -31,11 +31,11 @@ public:
     BufferMem() = default;
     BufferMem(u32 size) : data(std::vector<u8>(size)) {}
 
-    virtual u8* GetPtr() {
+    u8* GetPtr() override {
         return data.data();
     }
 
-    virtual u32 GetSize() const {
+    u32 GetSize() const override {
         return static_cast<u32>(data.size());
     }
 

src/video_core/shader/shader.h

@@ -70,6 +70,7 @@ private:
     void serialize(Archive& ar, const unsigned int) {
         ar& pos;
         ar& quat;
+        ar& color;
         ar& tc0;
         ar& tc1;
         ar& tc0_w;