From ebe5472e1d28d2fe144ac683958ccfb60b0a0f2a Mon Sep 17 00:00:00 2001 From: Matt Callaghan Date: Wed, 24 Nov 2010 17:13:12 +0000 Subject: [PATCH] Tiny commit. Just re-added 3D Vision to the config dialog. Hope nobody minds, I made sure it gets greyed out and all that. Sorry about my lack of commits, got another ongoing project that's gotten me a bit hooked. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6471 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/VideoConfig.cpp | 1 + Source/Core/VideoCommon/Src/VideoConfig.h | 1 + Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp | 10 ++++++++++ Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 1 + Source/Plugins/Plugin_VideoDX9/Src/main.cpp | 1 + Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 1 + 6 files changed, 15 insertions(+) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index bd4d522a73..9307d79e5d 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -45,6 +45,7 @@ VideoConfig::VideoConfig() backend_info.bUseRGBATextures = false; backend_info.bSupportsEFBToRAM = false; backend_info.bSupportsRealXFB = false; + backend_info.bSupports3DVision = false; } void VideoConfig::Load(const char *ini_file) diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h index 0436102f57..9a84260177 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.h +++ b/Source/Core/VideoCommon/Src/VideoConfig.h @@ -155,6 +155,7 @@ struct VideoConfig bool bUseRGBATextures; // used for D3D11 in TextureCache bool bSupportsEFBToRAM; bool bSupportsRealXFB; + bool bSupports3DVision; bool bAllowSignedBytes; // D3D9 doesn't support signed bytes (?) } backend_info; }; diff --git a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp b/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp index 7af79de442..a37d5e934b 100644 --- a/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp +++ b/Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp @@ -159,6 +159,16 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con szr_enh->Add(new SettingCheckBox(page_general, wxT("EFB Scaled Copy"), vconfig.bCopyEFBScaled)); szr_enh->Add(new SettingCheckBox(page_general, wxT("Pixel Lighting"), vconfig.bEnablePixelLigting)); szr_enh->Add(new SettingCheckBox(page_general, wxT("Force Bi/Trilinear Filtering"), vconfig.bForceFiltering)); + + SettingCheckBox* enable_3dVision = new SettingCheckBox(page_general, wxT("3D Vision (Requires Fullscreen)"), vconfig.b3DVision); + + if (!vconfig.backend_info.bSupports3DVision) + { + enable_3dVision->Disable(); + } + + szr_enh->Add(enable_3dVision); + } // - EFB diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index adb79f08a3..957060d361 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -153,6 +153,7 @@ void InitBackendInfo() g_Config.backend_info.bUseRGBATextures = true; // the GX formats barely match any D3D11 formats g_Config.backend_info.bSupportsEFBToRAM = false; g_Config.backend_info.bSupportsRealXFB = false; + g_Config.backend_info.bSupports3DVision = false; g_Config.backend_info.bAllowSignedBytes = true; } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index bec544ddfe..07593552fe 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -161,6 +161,7 @@ void InitBackendInfo() g_Config.backend_info.bUseRGBATextures = true; g_Config.backend_info.bSupportsEFBToRAM = true; g_Config.backend_info.bSupportsRealXFB = true; + g_Config.backend_info.bSupports3DVision = true; g_Config.backend_info.bAllowSignedBytes = false; } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 18b70a2a8b..3d5358787e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -169,6 +169,7 @@ void InitBackendInfo() g_Config.backend_info.bUseRGBATextures = false; g_Config.backend_info.bSupportsEFBToRAM = true; g_Config.backend_info.bSupportsRealXFB = true; + g_Config.backend_info.bSupports3DVision = false; g_Config.backend_info.bAllowSignedBytes = true; }