diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-08-23 07:33:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 07:33:25 +0200 |
| commit | 52af0770c352e5d599f8a95c2c9d2fe98b265418 (patch) | |
| tree | 573dc3416dd0627d76190aa04fb62e047f927c8f /Source/Core/VideoBackends/Null/VertexManager.cpp | |
| parent | 8d186a468fffaf73fe36f57d050e7370e37f91ca (diff) | |
| parent | 2bf05a544de9e737714c67ffe2247d661bc5e406 (diff) | |
Merge pull request #4141 from lioncash/vtx
VertexManagerBase: Get rid of static state
Diffstat (limited to 'Source/Core/VideoBackends/Null/VertexManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Null/VertexManager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/VertexManager.cpp index d70876cb84..2596243f93 100644 --- a/Source/Core/VideoBackends/Null/VertexManager.cpp +++ b/Source/Core/VideoBackends/Null/VertexManager.cpp @@ -35,19 +35,19 @@ VertexManager::~VertexManager() void VertexManager::ResetBuffer(u32 stride) { - s_pCurBufferPointer = s_pBaseBufferPointer = m_local_v_buffer.data(); - s_pEndBufferPointer = s_pCurBufferPointer + m_local_v_buffer.size(); + m_cur_buffer_pointer = m_base_buffer_pointer = m_local_v_buffer.data(); + m_end_buffer_pointer = m_cur_buffer_pointer + m_local_v_buffer.size(); IndexGenerator::Start(&m_local_i_buffer[0]); } void VertexManager::vFlush(bool use_dst_alpha) { VertexShaderCache::s_instance->SetShader( - use_dst_alpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, current_primitive_type); + use_dst_alpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, m_current_primitive_type); GeometryShaderCache::s_instance->SetShader( - use_dst_alpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, current_primitive_type); + use_dst_alpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, m_current_primitive_type); PixelShaderCache::s_instance->SetShader( - use_dst_alpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, current_primitive_type); + use_dst_alpha ? DSTALPHA_DUAL_SOURCE_BLEND : DSTALPHA_NONE, m_current_primitive_type); } } // namespace |