N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Hamish Milne 2020-03-28 16:29:18 +00:00
commit 86600e90d3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/memory_ref.h
View file

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

1
src/video_core/shader/shader.h
View file

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