summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-06-29 16:41:54 -0400
committerLioncash <mathew1800@gmail.com>2014-06-29 16:41:54 -0400
commitd720e3ed0be9b897e1b87d0cc04831e573617df2 (patch)
treec3da7fd7cf4138655a9a1f1b13a651e1a4cc6d1b /Source/Core/VideoBackends
parent933358a28c3a96b9b951481cf99a71fd2b68c280 (diff)
parent7db5a4b22db6cc7cea987a38d1d8ce9b0a594394 (diff)
Merge pull request #452 from degasus/stats
Video statistics update
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/VertexManager.cpp6
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp1
-rw-r--r--Source/Core/VideoBackends/OGL/VertexManager.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp
index 71e7d72b99..00e32ed871 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp
@@ -145,7 +145,7 @@ void VertexManager::Draw(UINT stride)
{
D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
D3D::context->DrawIndexed(IndexGenerator::GetIndexLen(), m_index_draw_offset, 0);
- INCSTAT(stats.thisFrame.numIndexedDrawCalls);
+ INCSTAT(stats.thisFrame.numDrawCalls);
}
else if (current_primitive_type == PRIMITIVE_LINES)
{
@@ -165,7 +165,7 @@ void VertexManager::Draw(UINT stride)
((DX11::Renderer*)g_renderer)->ApplyCullDisable(); // Disable culling for lines and points
D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
D3D::context->DrawIndexed(IndexGenerator::GetIndexLen(), m_index_draw_offset, 0);
- INCSTAT(stats.thisFrame.numIndexedDrawCalls);
+ INCSTAT(stats.thisFrame.numDrawCalls);
D3D::context->GSSetShader(nullptr, nullptr, 0);
((DX11::Renderer*)g_renderer)->RestoreCull();
@@ -189,7 +189,7 @@ void VertexManager::Draw(UINT stride)
((DX11::Renderer*)g_renderer)->ApplyCullDisable(); // Disable culling for lines and points
D3D::context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
D3D::context->DrawIndexed(IndexGenerator::GetIndexLen(), m_index_draw_offset, 0);
- INCSTAT(stats.thisFrame.numIndexedDrawCalls);
+ INCSTAT(stats.thisFrame.numDrawCalls);
D3D::context->GSSetShader(nullptr, nullptr, 0);
((DX11::Renderer*)g_renderer)->RestoreCull();
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index b1499c791a..c4c8f7c888 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -123,6 +123,7 @@ void SHADER::Bind()
{
if (CurrentProgram != glprogid)
{
+ INCSTAT(stats.thisFrame.numShaderChanges);
glUseProgram(glprogid);
CurrentProgram = glprogid;
}
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp
index b32c6adadd..1f3194a6fd 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp
@@ -124,7 +124,7 @@ void VertexManager::Draw(u32 stride)
} else {
glDrawRangeElements(primitive_mode, 0, max_index, index_size, GL_UNSIGNED_SHORT, (u8*)nullptr+s_index_offset);
}
- INCSTAT(stats.thisFrame.numIndexedDrawCalls);
+ INCSTAT(stats.thisFrame.numDrawCalls);
}
void VertexManager::vFlush(bool useDstAlpha)