mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-09 17:49:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5051 from stenzek/renderer-fixes

Browse source 
VideoBackends: Fix crashes introduced by #4999
This commit is contained in:
Markus Wick 2017-03-09 21:06:50 +01:00 • committed by GitHub
commit ef74c5eabd
26 changed files with 91 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D12/D3DBase.h
View file

@ -121,8 +121,6 @@ const std::string PixelShaderVersionString();
const std::string GeometryShaderVersionString();
const std::string VertexShaderVersionString();
unsigned int GetMaxTextureSize();
HRESULT SetFullscreenState(bool enable_fullscreen);
bool GetFullscreenState();

5
Source/Core/VideoBackends/D3D12/Render.cpp
View file

@ -1159,11 +1159,6 @@ void Renderer::SetInterlacingMode()
// EXISTINGD3D11TODO
}
u32 Renderer::GetMaxTextureSize()
{
return DX12::D3D::GetMaxTextureSize();
}
u16 Renderer::BBoxRead(int index)
{
// Here we get the min/max value of the truncated position of the upscaled framebuffer.

2
Source/Core/VideoBackends/D3D12/Render.h
View file

@ -61,8 +61,6 @@ public:
bool CheckForResize();
u32 GetMaxTextureSize() override;
static D3D12_BLEND_DESC GetResetBlendDesc();
static D3D12_DEPTH_STENCIL_DESC GetResetDepthStencilDesc();
static D3D12_RASTERIZER_DESC GetResetRasterizerDesc();

1
Source/Core/VideoBackends/D3D12/main.cpp
View file

@ -64,6 +64,7 @@ void VideoBackend::InitBackendInfo()
}
g_Config.backend_info.api_type = APIType::D3D;
g_Config.backend_info.MaxTextureSize = D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION;
g_Config.backend_info.bSupportsExclusiveFullscreen = false;
g_Config.backend_info.bSupportsDualSourceBlend = true;
g_Config.backend_info.bSupportsPrimitiveRestart = true;