summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMatt Callaghan <mattcallaghan@gmail.com>2010-11-24 17:13:12 +0000
committerMatt Callaghan <mattcallaghan@gmail.com>2010-11-24 17:13:12 +0000
commitebe5472e1d28d2fe144ac683958ccfb60b0a0f2a (patch)
tree853b3937375be558e44e2f87b5d758d4ba1d7eb3 /Source/Core
parent2808f75f74a7344c3fd74052d02fc154f523dca7 (diff)
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
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.cpp1
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.h1
-rw-r--r--Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp10
3 files changed, 12 insertions, 0 deletions
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