mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Final typo and error fixes and include reordering
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@372 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -20,7 +20,6 @@
|
||||
#include "MemoryUtil.h"
|
||||
#include "Thread.h"
|
||||
#include "OpcodeDecoding.h"
|
||||
#include "pluginspecs_video.h"
|
||||
|
||||
#include "Fifo.h"
|
||||
|
||||
@ -33,6 +32,13 @@ static u8 *videoBuffer;
|
||||
static int size = 0;
|
||||
static int readptr = 0;
|
||||
|
||||
void Fifo_DoState(ChunkFile &f) {
|
||||
f.Do(size);
|
||||
f.DoArray(videoBuffer, size);
|
||||
|
||||
f.Do(readptr);
|
||||
}
|
||||
|
||||
void Fifo_Init()
|
||||
{
|
||||
videoBuffer = (u8*)AllocateMemoryPages(FIFO_SIZE);
|
||||
|
@ -18,7 +18,11 @@
|
||||
#ifndef _FIFO_H
|
||||
#define _FIFO_H
|
||||
|
||||
#include "pluginspecs_video.h"
|
||||
|
||||
#include "Common.h"
|
||||
#include "ChunkFile.h"
|
||||
|
||||
// inline for speed!
|
||||
class FifoReader
|
||||
{
|
||||
@ -53,6 +57,7 @@ extern FifoReader fifo;
|
||||
void Fifo_Init();
|
||||
void Fifo_Shutdown();
|
||||
void Fifo_EnterLoop(const SVideoInitialize &video_initialize);
|
||||
void Fifo_DoState(ChunkFile &f);
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -16,7 +16,12 @@
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "VideoState.h"
|
||||
|
||||
#include "BPMemory.h"
|
||||
#include "CPMemory.h"
|
||||
#include "XFMemory.h"
|
||||
#include "TextureDecoder.h"
|
||||
#include "Fifo.h"
|
||||
|
||||
static void DoState(ChunkFile &f) {
|
||||
// BP Memory
|
||||
@ -33,10 +38,7 @@ static void DoState(ChunkFile &f) {
|
||||
f.Do(texMem);
|
||||
|
||||
// FIFO
|
||||
f.Do(size);
|
||||
f.DoArray(videoBuffer, sizeof(u8), size);
|
||||
|
||||
f.Do(readptr);
|
||||
Fifo_DoState(f);
|
||||
|
||||
//TODO: Check for more pointers in the data structures and make them
|
||||
// serializable
|
||||
|
Reference in New Issue
Block a user