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/OpcodeDecoder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoBackends/Software/OpcodeDecoder.cpp') diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp index 77deeed01f..66816e6626 100644 --- a/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp +++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.cpp @@ -57,7 +57,7 @@ static void DecodePrimitiveStream(u32 iBufferSize) { while (streamSize > 0 && iBufferSize >= vertexSize) { - g_pVideoData += vertexSize; + g_video_buffer_read_ptr += vertexSize; iBufferSize -= vertexSize; streamSize--; } @@ -94,26 +94,26 @@ static void ReadXFData(u32 iBufferSize) static void ExecuteDisplayList(u32 addr, u32 count) { - u8 *videoDataSave = g_pVideoData; + u8 *videoDataSave = g_video_buffer_read_ptr; u8 *dlStart = Memory::GetPointer(addr); - g_pVideoData = dlStart; + g_video_buffer_read_ptr = dlStart; while (OpcodeDecoder::CommandRunnable(count)) { OpcodeDecoder::Run(count); // if data was read by the opcode decoder then the video data pointer changed - u32 readCount = (u32)(g_pVideoData - dlStart); - dlStart = g_pVideoData; + u32 readCount = (u32)(g_video_buffer_read_ptr - dlStart); + dlStart = g_video_buffer_read_ptr; _assert_msg_(VIDEO, count >= readCount, "Display list underrun"); count -= readCount; } - g_pVideoData = videoDataSave; + g_video_buffer_read_ptr = videoDataSave; } static void DecodeStandard(u32 bufferSize) -- cgit v1.2.3