diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-24 16:39:01 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2015-01-24 16:39:01 -0600 |
| commit | bf0293231f4f87f1678cc4033dada67413e505b4 (patch) | |
| tree | 5d3769403b538886fa29a2f50631e5098cf22790 /Source/Core/VideoBackends | |
| parent | 195c7e6ab155aceed59e7112caebcb9f896c120e (diff) | |
| parent | 9cdfe889af54303dbeef305a26d13d4285ef1b5d (diff) | |
Merge pull request #1957 from lioncash/cs
Coding style cleanup from the zfreeze merge
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/VertexManager.cpp | 11 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/VertexManager.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp index 5b89e0507e..4dde43030c 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -41,10 +41,9 @@ static size_t s_baseVertex; static size_t s_index_offset; VertexManager::VertexManager() + : m_cpu_v_buffer(MAX_VBUFFER_SIZE), m_cpu_i_buffer(MAX_IBUFFER_SIZE) { CreateDeviceObjects(); - CpuVBuffer.resize(MAX_VBUFFER_SIZE); - CpuIBuffer.resize(MAX_IBUFFER_SIZE); } VertexManager::~VertexManager() @@ -83,13 +82,13 @@ void VertexManager::PrepareDrawBuffers(u32 stride) void VertexManager::ResetBuffer(u32 stride) { - if (CullAll) + if (s_cull_all) { // This buffer isn't getting sent to the GPU. Just allocate it on the cpu. - s_pCurBufferPointer = s_pBaseBufferPointer = CpuVBuffer.data(); - s_pEndBufferPointer = s_pBaseBufferPointer + CpuVBuffer.size(); + s_pCurBufferPointer = s_pBaseBufferPointer = m_cpu_v_buffer.data(); + s_pEndBufferPointer = s_pBaseBufferPointer + m_cpu_v_buffer.size(); - IndexGenerator::Start((u16*)CpuIBuffer.data()); + IndexGenerator::Start((u16*)m_cpu_i_buffer.data()); } else { diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index ba6e49c466..931c52625d 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -47,8 +47,8 @@ private: void PrepareDrawBuffers(u32 stride); // Alternative buffers in CPU memory for primatives we are going to discard. - std::vector<u8> CpuVBuffer; - std::vector<u16> CpuIBuffer; + std::vector<u8> m_cpu_v_buffer; + std::vector<u16> m_cpu_i_buffer; }; } |