ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MSVC2017 Non-UWP buildfixes

This commit is contained in:
twinaphex 2018-12-29 02:54:17 +01:00
parent 8f67cf7384
commit dd60b5d576
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/drivers/xaudio29.h
View File

@ -1266,33 +1266,27 @@ inline HRESULT XAudio2Create(_Outptr_ IXAudio2** ppXAudio2,
typedef HRESULT(__stdcall *XAudio2CreateWithVersionInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR, DWORD); typedef HRESULT(__stdcall *XAudio2CreateWithVersionInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR, DWORD);
typedef HRESULT(__stdcall *XAudio2CreateInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR); typedef HRESULT(__stdcall *XAudio2CreateInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR);
static HMODULE s_dllInstance = nullptr; static HMODULE s_dllInstance = NULL;
static XAudio2CreateWithVersionInfoFunc s_pfnAudio2CreateWithVersion = nullptr; static XAudio2CreateWithVersionInfoFunc s_pfnAudio2CreateWithVersion = NULL;
static XAudio2CreateInfoFunc s_pfnAudio2Create = nullptr; static XAudio2CreateInfoFunc s_pfnAudio2Create = NULL;
if (s_dllInstance == nullptr) if (s_dllInstance == NULL)
{ {
s_dllInstance = LoadLibraryEx(XAUDIO2_DLL, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); s_dllInstance = LoadLibraryEx(XAUDIO2_DLL, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
if (s_dllInstance == nullptr) if (s_dllInstance == NULL)
{
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
}
s_pfnAudio2CreateWithVersion = (XAudio2CreateWithVersionInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2CreateWithVersionInfo"); s_pfnAudio2CreateWithVersion = (XAudio2CreateWithVersionInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2CreateWithVersionInfo");
if (s_pfnAudio2CreateWithVersion == nullptr) if (s_pfnAudio2CreateWithVersion == NULL)
{ {
s_pfnAudio2Create = (XAudio2CreateInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2Create"); s_pfnAudio2Create = (XAudio2CreateInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2Create");
if (s_pfnAudio2Create == nullptr) if (s_pfnAudio2Create == NULL)
{
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
}
} }
} }
if (s_pfnAudio2CreateWithVersion != nullptr) if (s_pfnAudio2CreateWithVersion != NULL)
{
return (*s_pfnAudio2CreateWithVersion)(ppXAudio2, Flags, XAudio2Processor, NTDDI_VERSION); return (*s_pfnAudio2CreateWithVersion)(ppXAudio2, Flags, XAudio2Processor, NTDDI_VERSION);
}
return (*s_pfnAudio2Create)(ppXAudio2, Flags, XAudio2Processor); return (*s_pfnAudio2Create)(ppXAudio2, Flags, XAudio2Processor);
} }
#else #else

9
gfx/drivers/d3d11.c
View File

@ -687,11 +687,20 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
} }
else else
{ {
#if defined(__WINRT__)
if (FAILED(D3D11CreateDevice( if (FAILED(D3D11CreateDevice(
NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags,
requested_feature_levels, number_feature_levels, requested_feature_levels, number_feature_levels,
D3D11_SDK_VERSION, &d3d11->device, D3D11_SDK_VERSION, &d3d11->device,
&d3d11->supportedFeatureLevel, &d3d11->context))) &d3d11->supportedFeatureLevel, &d3d11->context)))
#else
if (FAILED(D3D11CreateDeviceAndSwapChain(
NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags,
requested_feature_levels, number_feature_levels,
D3D11_SDK_VERSION, &desc,
(IDXGISwapChain**)&d3d11->swapChain, &d3d11->device,
&d3d11->supportedFeatureLevel, &d3d11->context)))
#endif
goto error; goto error;
} }

4
menu/drivers_display/menu_display_vulkan.c
View File

@ -1,4 +1,4 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2016-2017 - Hans-Kristian Arntzen * Copyright (C) 2016-2017 - Hans-Kristian Arntzen
* Copyright (C) 2011-2017 - Daniel De Matteis * Copyright (C) 2011-2017 - Daniel De Matteis
* *
@ -349,7 +349,6 @@ static bool menu_display_vk_font_init_first(
static void menu_display_vk_scissor_begin(video_frame_info_t *video_info, static void menu_display_vk_scissor_begin(video_frame_info_t *video_info,
int x, int y, unsigned width, unsigned height) int x, int y, unsigned width, unsigned height)
{ {
VkRect2D sci;
vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL; vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL;
vk->tracker.use_scissor = true; vk->tracker.use_scissor = true;
@ -362,7 +361,6 @@ static void menu_display_vk_scissor_begin(video_frame_info_t *video_info,
static void menu_display_vk_scissor_end(video_frame_info_t *video_info) static void menu_display_vk_scissor_end(video_frame_info_t *video_info)
{ {
VkRect2D sci;
vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL; vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL;
vk->tracker.use_scissor = false; vk->tracker.use_scissor = false;
vk->tracker.dirty |= VULKAN_DIRTY_DYNAMIC_BIT; vk->tracker.dirty |= VULKAN_DIRTY_DYNAMIC_BIT;