ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2302 from lioncash/perf 

PerfQueryBase: Move common implementation variables into base class
This commit is contained in:
Markus Wick 2015-04-16 07:31:31 +02:00
parent 7063886520 63393570fb
commit cd0212ab1c
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/D3D/PerfQuery.cpp
View File

@ -6,7 +6,6 @@ namespace DX11 {
PerfQuery::PerfQuery() PerfQuery::PerfQuery()
: m_query_read_pos() : m_query_read_pos()
, m_query_count()
{ {
for (ActiveQuery& entry : m_query_buffer) for (ActiveQuery& entry : m_query_buffer)
{ {

4
Source/Core/VideoBackends/D3D/PerfQuery.h
View File

@ -36,10 +36,6 @@ private:
std::array<ActiveQuery, PERF_QUERY_BUFFER_SIZE> m_query_buffer; std::array<ActiveQuery, PERF_QUERY_BUFFER_SIZE> m_query_buffer;
int m_query_read_pos; int m_query_read_pos;
// TODO: sloppy
volatile int m_query_count;
volatile u32 m_results[PQG_NUM_MEMBERS];
}; };
} // namespace } // namespace

1
Source/Core/VideoBackends/OGL/PerfQuery.cpp
View File

@ -22,7 +22,6 @@ PerfQueryBase* GetPerfQuery()
PerfQuery::PerfQuery() PerfQuery::PerfQuery()
: m_query_read_pos() : m_query_read_pos()
, m_query_count()
{ {
ResetQuery(); ResetQuery();
} }

4
Source/Core/VideoBackends/OGL/PerfQuery.h
View File

@ -37,10 +37,6 @@ protected:
std::array<ActiveQuery, PERF_QUERY_BUFFER_SIZE> m_query_buffer; std::array<ActiveQuery, PERF_QUERY_BUFFER_SIZE> m_query_buffer;
u32 m_query_read_pos; u32 m_query_read_pos;
// TODO: sloppy
volatile u32 m_query_count;
volatile u32 m_results[PQG_NUM_MEMBERS];
private: private:
// Implementation // Implementation
std::unique_ptr<PerfQuery> m_query; std::unique_ptr<PerfQuery> m_query;

11
Source/Core/VideoCommon/PerfQueryBase.h
View File

@ -24,7 +24,11 @@ enum PerfQueryGroup
class PerfQueryBase class PerfQueryBase
{ {
public: public:
PerfQueryBase() {} PerfQueryBase()
: m_query_count(0)
{
}
virtual ~PerfQueryBase() {} virtual ~PerfQueryBase() {}
// Checks if performance queries are enabled in the gameini configuration. // Checks if performance queries are enabled in the gameini configuration.
@ -50,6 +54,11 @@ public:
// True if there are no further pending query results // True if there are no further pending query results
// NOTE: Called from CPU thread // NOTE: Called from CPU thread
virtual bool IsFlushed() const { return true; } virtual bool IsFlushed() const { return true; }
protected:
// TODO: sloppy
volatile u32 m_query_count;
volatile u32 m_results[PQG_NUM_MEMBERS];
}; };
extern PerfQueryBase* g_perf_query; extern PerfQueryBase* g_perf_query;