From 5739c537a24b9554ad28c81d47952a8a5482f001 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Fri, 5 Aug 2022 17:40:06 +0200 Subject: [PATCH] Some CXX_BUILD fixes --- deps/rcheevos/src/rhash/cdreader.c | 2 +- gfx/common/d3d9_common.c | 2 +- gfx/common/dxgi_common.h | 2 ++ gfx/drivers/d3d12.c | 4 ---- gfx/drivers/d3d9hlsl.c | 10 +++++----- gfx/include/dxsdk/d3dcompiler.h | 4 ++++ menu/menu_displaylist.c | 4 ++-- runtime_file.c | 4 +++- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/deps/rcheevos/src/rhash/cdreader.c b/deps/rcheevos/src/rhash/cdreader.c index 113f155933..9f464b1bbb 100644 --- a/deps/rcheevos/src/rhash/cdreader.c +++ b/deps/rcheevos/src/rhash/cdreader.c @@ -570,7 +570,7 @@ static void* cdreader_open_gdi_track(const char* path, uint32_t track) char file[256]; int64_t track_size; int track_type; - char* bin_path = ""; + char* bin_path = NULL; uint32_t current_track = 0; char* ptr, *ptr2, *end; int lba = 0; diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c index 00f8986e73..618d23e891 100644 --- a/gfx/common/d3d9_common.c +++ b/gfx/common/d3d9_common.c @@ -256,7 +256,7 @@ void *d3d9_texture_new_from_file(void *_dev, LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; void *buf = NULL; if (SUCCEEDED(D3D9CreateTextureFromFile((LPDIRECT3DDEVICE9)dev, - path, width, height, miplevels, usage, format, + path, width, height, miplevels, usage, (D3DFORMAT)format, (D3DPOOL)pool, filter, mipfilter, color_key, (D3DXIMAGE_INFO*)src_info_data, palette, (struct IDirect3DTexture9**)&buf))) diff --git a/gfx/common/dxgi_common.h b/gfx/common/dxgi_common.h index 02414daa05..995fe292b9 100644 --- a/gfx/common/dxgi_common.h +++ b/gfx/common/dxgi_common.h @@ -245,8 +245,10 @@ enum dxgi_swapchain_bit_depth #define _Analysis_assume_(expr) #define _Analysis_assume_nullterminated_(expr) +#ifndef RARCH_INTERNAL #define __in #define __out +#endif #define __in_bcount(size) #define __in_ecount(size) diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index 6639892296..767ead3755 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -1412,11 +1412,7 @@ static void d3d12_init_base(d3d12_video_t* d3d12) if (FAILED(DXGIEnumAdapters(d3d12->factory, i, &adapter))) break; #endif -#ifdef __cplusplus - adapter->GetDesc(adapter, &desc); -#else adapter->lpVtbl->GetDesc(adapter, &desc); -#endif utf16_to_char_string((const uint16_t*)desc.Description, str, sizeof(str)); diff --git a/gfx/drivers/d3d9hlsl.c b/gfx/drivers/d3d9hlsl.c index 58008c83c1..7e8f326159 100644 --- a/gfx/drivers/d3d9hlsl.c +++ b/gfx/drivers/d3d9hlsl.c @@ -238,8 +238,8 @@ static void hlsl_d3d9_renderchain_set_shader_params( float video_size[2]; float texture_size[2]; float output_size[2]; - void *fprg = pass->ftable; - void *vprg = pass->vtable; + LPD3DXCONSTANTTABLE fprg = (LPD3DXCONSTANTTABLE)pass->ftable; + LPD3DXCONSTANTTABLE vprg = (LPD3DXCONSTANTTABLE)pass->vtable; video_size[0] = video_w; video_size[1] = video_h; @@ -362,7 +362,7 @@ static void hlsl_d3d9_renderchain_calc_and_set_shader_mvp( d3d_matrix_multiply(&proj, &ortho, &rot); d3d_matrix_transpose(&matrix, &proj); - d3d9_hlsl_set_param_matrix(pass->vtable, + d3d9_hlsl_set_param_matrix((LPD3DXCONSTANTTABLE)pass->vtable, chain->chain.dev, "modelViewProj", (const void*)&matrix); } @@ -883,7 +883,7 @@ static bool d3d9_hlsl_init_chain(d3d9_video_t *d3d, if ( !hlsl_d3d9_renderchain_init( - d3d, d3d->renderchain_data, + d3d, (hlsl_renderchain_t*)d3d->renderchain_data, d3d->dev, &d3d->final_viewport, &link_info, rgb32 ? RETRO_PIXEL_FORMAT_XRGB8888 @@ -915,7 +915,7 @@ static bool d3d9_hlsl_init_chain(d3d9_video_t *d3d, current_height = out_height; if (!hlsl_d3d9_renderchain_add_pass( - d3d->renderchain_data, &link_info)) + (hlsl_renderchain_t*)d3d->renderchain_data, &link_info)) { RARCH_ERR("[D3D9]: Failed to add pass.\n"); return false; diff --git a/gfx/include/dxsdk/d3dcompiler.h b/gfx/include/dxsdk/d3dcompiler.h index 09de916ebd..733ae59203 100644 --- a/gfx/include/dxsdk/d3dcompiler.h +++ b/gfx/include/dxsdk/d3dcompiler.h @@ -321,11 +321,13 @@ D3DReflect(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, // reflection APIs. //---------------------------------------------------------------------------- +#ifndef RARCH_INTERNAL HRESULT WINAPI D3DReflectLibrary(__in_bcount(SrcDataSize) LPCVOID pSrcData, __in SIZE_T SrcDataSize, __in REFIID riid, __out LPVOID * ppReflector); +#endif //---------------------------------------------------------------------------- // D3DDisassemble: @@ -369,8 +371,10 @@ D3DDisassembleRegion(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, //---------------------------------------------------------------------------- // Shader linking and Function Linking Graph (FLG) APIs //---------------------------------------------------------------------------- +#ifndef RARCH_INTERNAL HRESULT WINAPI D3DCreateLinker(__out interface ID3D11Linker ** ppLinker); +#endif HRESULT WINAPI D3DLoadModule(_In_ LPCVOID pSrcData, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 4bd48ee698..0ab18fd008 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7889,7 +7889,7 @@ unsigned menu_displaylist_build_list( { if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, (enum msg_hash_enums) - MENU_ENUM_LABEL_NETPLAY_REQUEST_DEVICE_1 + user, + (MENU_ENUM_LABEL_NETPLAY_REQUEST_DEVICE_1 + user), PARSE_ONLY_BOOL, false) == 0) count++; } @@ -7923,7 +7923,7 @@ unsigned menu_displaylist_build_list( { if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list, (enum msg_hash_enums) - MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + user, + (MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + user), PARSE_ONLY_BOOL, false) == 0) count++; } diff --git a/runtime_file.c b/runtime_file.c index 6da1828ccb..1b4d7a2a89 100644 --- a/runtime_file.c +++ b/runtime_file.c @@ -695,7 +695,9 @@ static void last_played_human(runtime_log_t *runtime_log, /* Generate string */ snprintf(tmp, sizeof(tmp), "%u %s", - (int)delta, msg_hash_to_str((delta == 1) ? units[i][0] : units[i][1])); + (int)delta, msg_hash_to_str((delta == 1) + ? (enum msg_hash_enums)units[i][0] + : (enum msg_hash_enums)units[i][1])); strlcat(str, tmp, len); strlcat(str, " ", len); strlcat(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TIME_UNIT_AGO), len);