summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-01-24 15:12:52 -0500
committerLioncash <mathew1800@gmail.com>2015-01-24 15:16:48 -0500
commit9cdfe889af54303dbeef305a26d13d4285ef1b5d (patch)
treeeeef3b5b0ad41a993260f838ff5255d4cd7944b0 /Source/Core/VideoBackends
parentae514cb0f23f6d8648000a0650041a60a7c7e2d4 (diff)
Coding style cleanup from the zfreeze merge
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/OGL/VertexManager.cpp11
-rw-r--r--Source/Core/VideoBackends/OGL/VertexManager.h4
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;
};
}