From 0ae9e398c8e0f808eb4da6cc6f5e3cd553e975a1 Mon Sep 17 00:00:00 2001 From: comex Date: Tue, 26 Aug 2014 13:37:32 -0400 Subject: Rejigger some FIFO buffer variables to be more rational. videoBuffer -> s_video_buffer size -> s_video_buffer_write_ptr g_pVideoData -> g_video_buffer_read_ptr (impl moved to Fifo.cpp) This eradicates the wonderful use of 'size' as a global name, and makes it clear that s_video_buffer_write_ptr and g_video_buffer_read_ptr are the two ends of the FIFO buffer s_video_buffer. Oh, and remove a useless namespace {}. --- Source/Core/VideoBackends/Software/SWCommandProcessor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWCommandProcessor.cpp') diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index 5f227d4b5c..56832eb786 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -57,7 +57,7 @@ void DoState(PointerWrap &p) p.Do(interruptWaiting); // Is this right? - p.DoArray(g_pVideoData,writePos); + p.DoArray(g_video_buffer_read_ptr,writePos); } static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate) @@ -95,7 +95,7 @@ void Init() interruptSet = false; interruptWaiting = false; - g_pVideoData = nullptr; + g_video_buffer_read_ptr = nullptr; g_bSkipCurrentFrame = false; } @@ -311,7 +311,7 @@ bool RunBuffer() _dbg_assert_(COMMANDPROCESSOR, writePos >= readPos); - g_pVideoData = &commandBuffer[readPos]; + g_video_buffer_read_ptr = &commandBuffer[readPos]; u32 availableBytes = writePos - readPos; @@ -322,7 +322,7 @@ bool RunBuffer() OpcodeDecoder::Run(availableBytes); // if data was read by the opcode decoder then the video data pointer changed - readPos = (u32)(g_pVideoData - &commandBuffer[0]); + readPos = (u32)(g_video_buffer_read_ptr - &commandBuffer[0]); _dbg_assert_(VIDEO, writePos >= readPos); availableBytes = writePos - readPos; } -- cgit v1.2.3