Don't attempt Direct HMD mode, apparently it crashes OpenGL + AMD.

CarlKenner · Aug 15, 2014 · 6c94879 · 6c94879
1 parent 22e2ae2
commit 6c94879
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Source/Core/DiscIO/BannerLoaderGC.cpp b/Source/Core/DiscIO/BannerLoaderGC.cpp
@@ -28,8 +28,12 @@ CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVol
 			_rFileSystem.ReadFile("opening.bnr", m_pBannerFile, FileSize);
 			m_BNRType = getBannerType();
 			if (m_BNRType == BANNER_UNKNOWN)
-				PanicAlertT("Invalid opening.bnr found in gcm:\n%s\n You may need to redump this game.",
-					_rFileSystem.GetVolume()->GetName().c_str());
+			{
+//				PanicAlertT("Invalid opening.bnr found in gcm:\n%s\n You may need to redump this game.",
+//					_rFileSystem.GetVolume()->GetName().c_str());
+				NOTICE_LOG(VR, "Invalid opening.bnr found in gcm:\n%s\n You may need to redump this game.",
+									_rFileSystem.GetVolume()->GetName().c_str());
+			}
 			else m_IsValid = true;
 		}
 	}

diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
@@ -91,7 +91,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 #ifdef _WIN32
 		cfg.OGL.Window = (HWND)((cInterfaceWGL*)GLInterface)->m_window_handle;
 		cfg.OGL.DC = GetDC(cfg.OGL.Window);
-		ovrHmd_AttachToWindow(hmd, cfg.OGL.Window, nullptr, nullptr);
+		//ovrHmd_AttachToWindow(hmd, cfg.OGL.Window, nullptr, nullptr);
 #endif
 		ovrHmd_ConfigureRendering(hmd, &cfg.Config, ovrDistortionCap_Chromatic | ovrDistortionCap_TimeWarp,
 			g_eye_fov, g_eye_render_desc);