Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU/HW: Don't crash when switching to incompatible renderer

Browse source
This commit is contained in:
Connor McLaughlin 2019-11-04 01:57:08 +10:00
parent a397979d72
commit 5d26c2177f
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/gpu_hw_d3d11.cpp
View file

@ -20,17 +20,17 @@ GPU_HW_D3D11::~GPU_HW_D3D11()
bool GPU_HW_D3D11::Initialize(HostDisplay* host_display, System* system, DMA* dma, bool GPU_HW_D3D11::Initialize(HostDisplay* host_display, System* system, DMA* dma,
InterruptController* interrupt_controller, Timers* timers) InterruptController* interrupt_controller, Timers* timers)
{ {
SetCapabilities();
if (!GPU_HW::Initialize(host_display, system, dma, interrupt_controller, timers))
return false;
if (host_display->GetRenderAPI() != HostDisplay::RenderAPI::D3D11) if (host_display->GetRenderAPI() != HostDisplay::RenderAPI::D3D11)
{ {
Log_ErrorPrintf("Host render API is incompatible"); Log_ErrorPrintf("Host render API is incompatible");
return false; return false;
} }
SetCapabilities();
if (!GPU_HW::Initialize(host_display, system, dma, interrupt_controller, timers))
return false;
m_device = static_cast<ID3D11Device*>(host_display->GetHostRenderDevice()); m_device = static_cast<ID3D11Device*>(host_display->GetHostRenderDevice());
m_context = static_cast<ID3D11DeviceContext*>(host_display->GetHostRenderContext()); m_context = static_cast<ID3D11DeviceContext*>(host_display->GetHostRenderContext());
if (!m_device || !m_context) if (!m_device || !m_context)

12
src/core/gpu_hw_opengl.cpp
View file

@ -19,17 +19,17 @@ GPU_HW_OpenGL::~GPU_HW_OpenGL()
bool GPU_HW_OpenGL::Initialize(HostDisplay* host_display, System* system, DMA* dma, bool GPU_HW_OpenGL::Initialize(HostDisplay* host_display, System* system, DMA* dma,
InterruptController* interrupt_controller, Timers* timers) InterruptController* interrupt_controller, Timers* timers)
{ {
SetCapabilities(); if (host_display->GetRenderAPI() != HostDisplay::RenderAPI::OpenGL)
if (!GPU_HW::Initialize(host_display, system, dma, interrupt_controller, timers))
return false;
if (m_host_display->GetRenderAPI() != HostDisplay::RenderAPI::OpenGL)
{ {
Log_ErrorPrintf("Host render API type is incompatible"); Log_ErrorPrintf("Host render API type is incompatible");
return false; return false;
} }
SetCapabilities();
if (!GPU_HW::Initialize(host_display, system, dma, interrupt_controller, timers))
return false;
CreateFramebuffer(); CreateFramebuffer();
CreateVertexBuffer(); CreateVertexBuffer();
CreateUniformBuffer(); CreateUniformBuffer();

2
src/core/system.cpp
View file

@ -113,9 +113,11 @@ bool System::CreateGPU()
m_gpu = GPU::CreateHardwareOpenGLRenderer(); m_gpu = GPU::CreateHardwareOpenGLRenderer();
break; break;
#ifdef WIN32
case Settings::GPURenderer::HardwareD3D11: case Settings::GPURenderer::HardwareD3D11:
m_gpu = GPU::CreateHardwareD3D11Renderer(); m_gpu = GPU::CreateHardwareD3D11Renderer();
break; break;
#endif
case Settings::GPURenderer::Software: case Settings::GPURenderer::Software:
default: default:

2
src/duckstation/sdl_host_interface.cpp
View file

@ -71,7 +71,7 @@ bool SDLHostInterface::CreateSDLWindow()
bool SDLHostInterface::CreateDisplay() bool SDLHostInterface::CreateDisplay()
{ {
#ifdef Y_PLATFORM_WINDOWS #ifdef WIN32
m_display = UseOpenGLRenderer() ? OpenGLHostDisplay::Create(m_window) : D3D11HostDisplay::Create(m_window); m_display = UseOpenGLRenderer() ? OpenGLHostDisplay::Create(m_window) : D3D11HostDisplay::Create(m_window);
#else #else
m_display = OpenGLHostDisplay::Create(m_window); m_display = OpenGLHostDisplay::Create(m_window);

2
src/duckstation/sdl_host_interface.h
View file

@ -50,7 +50,7 @@ private:
bool HasSystem() const { return static_cast<bool>(m_system); } bool HasSystem() const { return static_cast<bool>(m_system); }
#ifdef Y_PLATFORM_WINDOWS #ifdef WIN32
bool UseOpenGLRenderer() const { return m_settings.gpu_renderer == Settings::GPURenderer::HardwareOpenGL; } bool UseOpenGLRenderer() const { return m_settings.gpu_renderer == Settings::GPURenderer::HardwareOpenGL; }
#else #else
bool UseOpenGLRenderer() const { return true; } bool UseOpenGLRenderer() const { return true; }