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/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) diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 9575563c7c..5370c35750 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -97,7 +97,6 @@ void InterpretDisplayList(u32 address, u32 size) { Decode(); } - INCSTAT(stats.numDListsCalled); INCSTAT(stats.thisFrame.numDListsCalled); // un-swap diff --git a/Source/Core/VideoCommon/Statistics.cpp b/Source/Core/VideoCommon/Statistics.cpp index 303972fc90..b0923210fa 100644 --- a/Source/Core/VideoCommon/Statistics.cpp +++ b/Source/Core/VideoCommon/Statistics.cpp @@ -31,16 +31,11 @@ std::string Statistics::ToString() str += StringFromFormat("Textures alive: %i\n", stats.numTexturesAlive); str += StringFromFormat("pshaders created: %i\n", stats.numPixelShadersCreated); str += StringFromFormat("pshaders alive: %i\n",stats.numPixelShadersAlive); - str += StringFromFormat("pshaders (unique, delete cache first): %i\n",stats.numUniquePixelShaders); str += StringFromFormat("vshaders created: %i\n",stats.numVertexShadersCreated); str += StringFromFormat("vshaders alive: %i\n",stats.numVertexShadersAlive); - str += StringFromFormat("dlists called: %i\n",stats.numDListsCalled); - str += StringFromFormat("dlists called(f): %i\n",stats.thisFrame.numDListsCalled); - str += StringFromFormat("dlists alive: %i\n",stats.numDListsAlive); + str += StringFromFormat("dlists called: %i\n",stats.thisFrame.numDListsCalled); str += StringFromFormat("Primitive joins: %i\n",stats.thisFrame.numPrimitiveJoins); str += StringFromFormat("Draw calls: %i\n",stats.thisFrame.numDrawCalls); - str += StringFromFormat("Indexed draw calls: %i\n",stats.thisFrame.numIndexedDrawCalls); - str += StringFromFormat("Buffer splits: %i\n",stats.thisFrame.numBufferSplits); str += StringFromFormat("Primitives: %i\n",stats.thisFrame.numPrims); str += StringFromFormat("Primitives (DL): %i\n",stats.thisFrame.numDLPrims); str += StringFromFormat("XF loads: %i\n",stats.thisFrame.numXFLoads); diff --git a/Source/Core/VideoCommon/Statistics.h b/Source/Core/VideoCommon/Statistics.h index 9f9f97bcbf..55e7121ce3 100644 --- a/Source/Core/VideoCommon/Statistics.h +++ b/Source/Core/VideoCommon/Statistics.h @@ -20,17 +20,8 @@ struct Statistics int numTexturesCreated; int numTexturesAlive; - int numRenderTargetsCreated; - int numRenderTargetsAlive; - - int numDListsCalled; - int numDListsCreated; - int numDListsAlive; - int numVertexLoaders; - int numUniquePixelShaders; - float proj_0, proj_1, proj_2, proj_3, proj_4, proj_5; float gproj_0, gproj_1, gproj_2, gproj_3, gproj_4, gproj_5; float gproj_6, gproj_7, gproj_8, gproj_9, gproj_10, gproj_11, gproj_12, gproj_13, gproj_14, gproj_15; @@ -50,15 +41,12 @@ struct Statistics int numCPLoadsInDL; int numXFLoadsInDL; - int numDLs; int numPrims; int numDLPrims; int numShaderChanges; int numPrimitiveJoins; int numDrawCalls; - int numIndexedDrawCalls; - int numBufferSplits; int numDListsCalled;