Cleaning up XK's mess, added a simple profiler, minor disasm fix. Too lazy to split it up into individual changes. Savestates not yet working.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@381 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 12 insertions, 14 deletions

diff --git a/Source/Core/VideoCommon/Src/VideoState.cpp b/Source/Core/VideoCommon/Src/VideoState.cpp
index d0366e4bb4..a774ac5426 100644
--- a/Source/Core/VideoCommon/Src/VideoState.cpp
+++ b/Source/Core/VideoCommon/Src/VideoState.cpp
@@ -23,35 +23,33 @@
 #include "TextureDecoder.h"

 #include "Fifo.h"

 

-static void DoState(ChunkFile &f) {

+static void DoState(PointerWrap &p) {

     // BP Memory

-    f.Do(bpmem);

+    p.Do(bpmem);

     // CP Memory

-    f.Do(arraybases);

-    f.Do(arraystrides);

-    f.Do(MatrixIndexA);

-    f.Do(MatrixIndexB);

+    p.Do(arraybases);

+    p.Do(arraystrides);

+    p.Do(MatrixIndexA);

+    p.Do(MatrixIndexB);

     // XF Memory

-    f.Do(xfregs);

+    p.Do(xfregs);

 	PanicAlert("video: XFMem");

-    f.Do(xfmem);

+    p.Do(xfmem);

 	PanicAlert("video: Texture decoder");

     // Texture decoder

-    f.Do(texMem);

+    p.Do(texMem);

  

     // FIFO

 	PanicAlert("video: FIFO");

-    Fifo_DoState(f);

+    Fifo_DoState(p);

 

     //TODO: Check for more pointers in the data structures and make them

     //      serializable

 }

 

-void VideoCommon_DoState(ChunkFile &f) {

+void VideoCommon_DoState(PointerWrap &p) {

     PanicAlert("Saving state from Video Common Library");

     //TODO: Save the video state

-    f.Descend("VID ");

-    DoState(f);

-    f.Ascend();

+    DoState(p);

 	PanicAlert("END save video");

 }