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

Rename "cached_device" to "cached_device_d3d11" avoid a name conflict on griffin builds

Browse Source
This commit is contained in:
Dwedit 2018-03-28 10:33:37 -05:00
parent 8c6f05e715
commit 2c1cb6cf55
1 changed files with 4 additions and 4 deletions

8
gfx/drivers/d3d11.c

@ -39,7 +39,7 @@
#include "../drivers_shader/slang_process.h" #include "../drivers_shader/slang_process.h"
#endif #endif
static D3D11Device cached_device; static D3D11Device cached_device_d3d11;
static D3D_FEATURE_LEVEL cached_supportedFeatureLevel; static D3D_FEATURE_LEVEL cached_supportedFeatureLevel;
static D3D11DeviceContext cached_context; static D3D11DeviceContext cached_context;
@ -555,7 +555,7 @@ static void d3d11_gfx_free(void* data)
if (video_driver_is_video_cache_context()) if (video_driver_is_video_cache_context())
{ {
cached_device = d3d11->device; cached_device_d3d11 = d3d11->device;
cached_context = d3d11->context; cached_context = d3d11->context;
cached_supportedFeatureLevel = d3d11->supportedFeatureLevel; 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 #ifdef DEBUG
flags |= D3D11_CREATE_DEVICE_DEBUG; flags |= D3D11_CREATE_DEVICE_DEBUG;
#endif #endif
if(cached_device && cached_context) if(cached_device_d3d11 && cached_context)
{ {
IDXGIFactory* dxgiFactory = NULL; IDXGIFactory* dxgiFactory = NULL;
IDXGIDevice* dxgiDevice = NULL; IDXGIDevice* dxgiDevice = NULL;
IDXGIAdapter* adapter = NULL; IDXGIAdapter* adapter = NULL;
d3d11->device = cached_device; d3d11->device = cached_device_d3d11;
d3d11->context = cached_context; d3d11->context = cached_context;
d3d11->supportedFeatureLevel = cached_supportedFeatureLevel; d3d11->supportedFeatureLevel = cached_supportedFeatureLevel;