Some cleanups.

PE perf metrics officially declared unsupported for the D3D9 project (out of pure laziness, anyone who cares can implement them :P).
This commit is contained in:
NeoBrainX 2013-03-01 01:31:57 +01:00
parent 1c9860246c
commit cbf5efe191
6 changed files with 7 additions and 8 deletions

View File

@ -22,7 +22,7 @@ namespace OSD
{ {
// On-screen message display // 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 DrawMessages(); // draw the current messages on the screen. Only call once per frame.
void ClearMessages(); void ClearMessages();

View File

@ -174,7 +174,6 @@ void VideoConfig::VerifyValidity()
if (!backend_info.bSupports3DVision) b3DVision = false; if (!backend_info.bSupports3DVision) b3DVision = false;
if (!backend_info.bSupportsFormatReinterpretation) bEFBEmulateFormatChanges = false; if (!backend_info.bSupportsFormatReinterpretation) bEFBEmulateFormatChanges = false;
if (!backend_info.bSupportsPixelLighting) bEnablePixelLighting = false; if (!backend_info.bSupportsPixelLighting) bEnablePixelLighting = false;
if (!backend_info.bSupportsPixelPerfQuery) bDisablePixelPerf = true;
} }
void VideoConfig::Save(const char *ini_file) void VideoConfig::Save(const char *ini_file)

View File

@ -163,7 +163,6 @@ struct VideoConfig
bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL bool bSupportsDualSourceBlend; // only supported by D3D11 and OpenGL
bool bSupportsFormatReinterpretation; bool bSupportsFormatReinterpretation;
bool bSupportsPixelLighting; bool bSupportsPixelLighting;
bool bSupportsPixelPerfQuery;
} backend_info; } backend_info;
// Utility // Utility

View File

@ -95,7 +95,6 @@ void InitBackendInfo()
g_Config.backend_info.bSupportsDualSourceBlend = true; g_Config.backend_info.bSupportsDualSourceBlend = true;
g_Config.backend_info.bSupportsFormatReinterpretation = true; g_Config.backend_info.bSupportsFormatReinterpretation = true;
g_Config.backend_info.bSupportsPixelLighting = true; g_Config.backend_info.bSupportsPixelLighting = true;
g_Config.backend_info.bSupportsPixelPerfQuery = true;
IDXGIFactory* factory; IDXGIFactory* factory;
IDXGIAdapter* ad; IDXGIAdapter* ad;

View File

@ -97,9 +97,6 @@ void InitBackendInfo()
g_Config.backend_info.bSupports3DVision = true; g_Config.backend_info.bSupports3DVision = true;
g_Config.backend_info.bSupportsDualSourceBlend = false; g_Config.backend_info.bSupportsDualSourceBlend = false;
g_Config.backend_info.bSupportsFormatReinterpretation = true; g_Config.backend_info.bSupportsFormatReinterpretation = true;
g_Config.backend_info.bSupportsPixelPerfQuery = false;
g_Config.backend_info.bSupportsPixelLighting = C_PLIGHTS + 40 <= maxConstants && C_PMATERIALS + 4 <= maxConstants; g_Config.backend_info.bSupportsPixelLighting = C_PLIGHTS + 40 <= maxConstants && C_PMATERIALS + 4 <= maxConstants;
// adapters // adapters
@ -159,6 +156,12 @@ bool VideoBackend::Initialize(void *&window_handle)
s_BackendInitialized = true; s_BackendInitialized = true;
if (!g_Config.bDisablePixelPerf)
{
OSD::AddMessage("PE perf metrics enabled although the D3D9 backend doesn't support them!");
OSD::AddMessage("Try a different backend when issues arise.");
}
return true; return true;
} }

View File

@ -136,7 +136,6 @@ void InitBackendInfo()
g_Config.backend_info.bSupportsDualSourceBlend = false; // supported, but broken g_Config.backend_info.bSupportsDualSourceBlend = false; // supported, but broken
g_Config.backend_info.bSupportsFormatReinterpretation = false; g_Config.backend_info.bSupportsFormatReinterpretation = false;
g_Config.backend_info.bSupportsPixelLighting = true; g_Config.backend_info.bSupportsPixelLighting = true;
g_Config.backend_info.bSupportsPixelPerfQuery = false;
// aamodes // aamodes
const char* caamodes[] = {"None", "2x", "4x", "8x", "8x CSAA", "8xQ CSAA", "16x CSAA", "16xQ CSAA"}; const char* caamodes[] = {"None", "2x", "4x", "8x", "8x CSAA", "8xQ CSAA", "16x CSAA", "16xQ CSAA"};