Merge pull request #37 from degasus/VideoCommonApiFixes

VideoCommon API cleanups

1 files changed, 0 insertions, 21 deletions

diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/PerfQuery.cpp
index 4ab148cbfa..4f30658a59 100644
--- a/Source/Core/VideoBackends/OGL/PerfQuery.cpp
+++ b/Source/Core/VideoBackends/OGL/PerfQuery.cpp
@@ -28,9 +28,6 @@ PerfQuery::~PerfQuery()
 
 void PerfQuery::EnableQuery(PerfQueryGroup type)
 {
-	if (!ShouldEmulate())
-		return;
-
 	// Is this sane?
 	if (m_query_count > m_query_buffer.size() / 2)
 		WeakFlush();
@@ -55,9 +52,6 @@ void PerfQuery::EnableQuery(PerfQueryGroup type)
 
 void PerfQuery::DisableQuery(PerfQueryGroup type)
 {
-	if (!ShouldEmulate())
-		return;
-
 	// stop query
 	if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
 	{
@@ -67,17 +61,11 @@ void PerfQuery::DisableQuery(PerfQueryGroup type)
 
 bool PerfQuery::IsFlushed() const
 {
-	if (!ShouldEmulate())
-		return true;
-
 	return 0 == m_query_count;
 }
 
 void PerfQuery::FlushOne()
 {
-	if (!ShouldEmulate())
-		return;
-
 	auto& entry = m_query_buffer[m_query_read_pos];
 
 	GLuint result = 0;
@@ -93,18 +81,12 @@ void PerfQuery::FlushOne()
 // TODO: could selectively flush things, but I don't think that will do much
 void PerfQuery::FlushResults()
 {
-	if (!ShouldEmulate())
-		return;
-
 	while (!IsFlushed())
 		FlushOne();
 }
 
 void PerfQuery::WeakFlush()
 {
-	if (!ShouldEmulate())
-		return;
-
 	while (!IsFlushed())
 	{
 		auto& entry = m_query_buffer[m_query_read_pos];
@@ -131,9 +113,6 @@ void PerfQuery::ResetQuery()
 
 u32 PerfQuery::GetQueryResult(PerfQueryType type)
 {
-	if (!ShouldEmulate())
-		return 0;
-
 	u32 result = 0;
 
 	if (type == PQ_ZCOMP_INPUT_ZCOMPLOC || type == PQ_ZCOMP_OUTPUT_ZCOMPLOC)