summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorNeoBrainX <NeoBrainX@googlemail.com>2013-03-01 01:31:57 +0100
committerNeoBrainX <NeoBrainX@googlemail.com>2013-03-01 01:31:57 +0100
commitcbf5efe19108a677987242f5ba6a71b38e129c05 (patch)
treee6c9d5a0ca9729e0e0e21ba3fca11beec7d618f6 /Source/Core
parent1c9860246c1773ede5c35ba15d774cdb566fae18 (diff)
Some cleanups.
PE perf metrics officially declared unsupported for the D3D9 project (out of pure laziness, anyone who cares can implement them :P).
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/VideoCommon/Src/OnScreenDisplay.h2
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.cpp1
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.h1
3 files changed, 1 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Src/OnScreenDisplay.h b/Source/Core/VideoCommon/Src/OnScreenDisplay.h
index 3777e2b5d3..80187b8ac3 100644
--- a/Source/Core/VideoCommon/Src/OnScreenDisplay.h
+++ b/Source/Core/VideoCommon/Src/OnScreenDisplay.h
@@ -22,7 +22,7 @@ namespace OSD
{
// On-screen message display
-void AddMessage(const char* str, u32 ms);
+void AddMessage(const char* str, u32 ms = 2000);
void DrawMessages(); // draw the current messages on the screen. Only call once per frame.
void ClearMessages();
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 74484efb01..bd5c6a7acb 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -174,7 +174,6 @@ void VideoConfig::VerifyValidity()
if (!backend_info.bSupports3DVision) b3DVision = false;
if (!backend_info.bSupportsFormatReinterpretation) bEFBEmulateFormatChanges = false;
if (!backend_info.bSupportsPixelLighting) bEnablePixelLighting = false;
- if (!backend_info.bSupportsPixelPerfQuery) bDisablePixelPerf = true;
}
void VideoConfig::Save(const char *ini_file)
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 29ad6ec721..c9d2eef217 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -163,7 +163,6 @@ struct VideoConfig
bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL
bool bSupportsFormatReinterpretation;
bool bSupportsPixelLighting;
- bool bSupportsPixelPerfQuery;
} backend_info;
// Utility