mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-09 09:39:13 +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

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

@ -1129,11 +1129,6 @@ void Renderer::SetInterlacingMode()
// TODO
}
u32 Renderer::GetMaxTextureSize()
{
return DX11::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/D3D/Render.h
View file

@ -62,8 +62,6 @@ public:
bool CheckForResize();
u32 GetMaxTextureSize() override;
private:
void BlitScreen(TargetRectangle src, TargetRectangle dst, D3DTexture2D* src_texture,
u32 src_width, u32 src_height, float Gamma);

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

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