mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-12 04:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6480 from Dwedit/fix_d3d_duplicate

Browse Source 
Rename "cached_device" to "cached_device_d3d11" to avoid a name conflict on griffin builds
This commit is contained in:
Twinaphex 2018-03-28 17:38:11 +02:00 committed by GitHub
commit 02ce39869c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/drivers/d3d11.c
View File

@ -39,7 +39,7 @@
#include "../drivers_shader/slang_process.h"
#endif
static D3D11Device cached_device;
static D3D11Device cached_device_d3d11;
static D3D_FEATURE_LEVEL cached_supportedFeatureLevel;
static D3D11DeviceContext cached_context;
@ -555,7 +555,7 @@ static void d3d11_gfx_free(void* data)
if (video_driver_is_video_cache_context())
{
cached_device = d3d11->device;
cached_device_d3d11 = d3d11->device;
cached_context = d3d11->context;
cached_supportedFeatureLevel = d3d11->supportedFeatureLevel;
}
@ -632,13 +632,13 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
#ifdef DEBUG
flags |= D3D11_CREATE_DEVICE_DEBUG;
#endif
if(cached_device && cached_context)
if(cached_device_d3d11 && cached_context)
{
IDXGIFactory* dxgiFactory = NULL;
IDXGIDevice* dxgiDevice = NULL;
IDXGIAdapter* adapter = NULL;
d3d11->device = cached_device;
d3d11->device = cached_device_d3d11;
d3d11->context = cached_context;
d3d11->supportedFeatureLevel = cached_supportedFeatureLevel;