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

More compatibility fixes for CXX_BUILD

Browse Source
This commit is contained in:
twinaphex 2018-01-25 16:33:28 +01:00
parent b0f7728606
commit 8e3b3762ad
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gfx/common/d3d_common.c
View File

@ -654,7 +654,8 @@ static void *d3d_texture_new_from_file(
#if defined(HAVE_D3D9) #if defined(HAVE_D3D9)
hr = D3DCreateTextureFromFile((LPDIRECT3DDEVICE9)dev, hr = D3DCreateTextureFromFile((LPDIRECT3DDEVICE9)dev,
path, width, height, miplevels, usage, format, path, width, height, miplevels, usage, format,
pool, filter, mipfilter, color_key, src_info_data, (D3DPOOL)pool, filter, mipfilter, color_key,
(D3DXIMAGE_INFO*)src_info_data,
palette, (struct IDirect3DTexture9**)&buf); palette, (struct IDirect3DTexture9**)&buf);
#endif #endif
break; break;
@ -662,7 +663,7 @@ static void *d3d_texture_new_from_file(
#if defined(HAVE_D3D8) #if defined(HAVE_D3D8)
hr = D3DCreateTextureFromFile((LPDIRECT3DDEVICE8)dev, hr = D3DCreateTextureFromFile((LPDIRECT3DDEVICE8)dev,
path, width, height, miplevels, usage, format, path, width, height, miplevels, usage, format,
pool, filter, mipfilter, color_key, src_info_data, (D3DPOOL)pool, filter, mipfilter, color_key, src_info_data,
palette, (struct IDirect3DTeture8**)&buf); palette, (struct IDirect3DTeture8**)&buf);
#endif #endif
break; break;
@ -692,7 +693,8 @@ void *d3d_texture_new(void *_dev,
#ifdef HAVE_D3DX #ifdef HAVE_D3DX
return d3d_texture_new_from_file(_dev, return d3d_texture_new_from_file(_dev,
path, width, height, miplevels, path, width, height, miplevels,
usage, (D3DFORMAT)format, pool, filter, mipfilter, usage, (D3DFORMAT)format,
(D3DPOOL)pool, filter, mipfilter,
color_key, src_info_data, palette); color_key, src_info_data, palette);
#else #else
return NULL; return NULL;
@ -712,11 +714,14 @@ void *d3d_texture_new(void *_dev,
#ifdef __cplusplus #ifdef __cplusplus
hr = dev->CreateTexture( hr = dev->CreateTexture(
width, height, miplevels, usage, width, height, miplevels, usage,
(D3DFORMAT)format, pool, (LPDIRECT3DTEXTURE9)&buf, NULL); (D3DFORMAT)format,
(D3DPOOL)pool,
(struct IDirect3DTexture9**)&buf, NULL);
#else #else
hr = IDirect3DDevice9_CreateTexture(dev, hr = IDirect3DDevice9_CreateTexture(dev,
width, height, miplevels, usage, width, height, miplevels, usage,
(D3DFORMAT)format, pool, (D3DFORMAT)format,
(D3DPOOL)pool,
(struct IDirect3DTexture9**)&buf, NULL); (struct IDirect3DTexture9**)&buf, NULL);
#endif #endif
#endif #endif
@ -998,9 +1003,12 @@ void *d3d_vertex_buffer_new(void *_dev,
} }
#ifdef __cplusplus #ifdef __cplusplus
hr = dev->CreateVertexBuffer(length, usage, fvf, pool, (LPDIRECT3DVERTEXBUFFER9*)&buf, NULL); hr = dev->CreateVertexBuffer(length, usage, fvf,
(D3DPOOL)pool,
(LPDIRECT3DVERTEXBUFFER9*)&buf, NULL);
#else #else
hr = IDirect3DDevice9_CreateVertexBuffer(dev, length, usage, fvf, pool, hr = IDirect3DDevice9_CreateVertexBuffer(dev, length, usage, fvf,
(D3DPOOL)pool,
(LPDIRECT3DVERTEXBUFFER9*)&buf, NULL); (LPDIRECT3DVERTEXBUFFER9*)&buf, NULL);
#endif #endif
@ -1014,7 +1022,8 @@ void *d3d_vertex_buffer_new(void *_dev,
#ifdef __cplusplus #ifdef __cplusplus
hr = dev->CreateVertexBuffer(length, usage, fvf, (D3DPOOL)pool, (IDirect3DVertexBuffer8**)&buf); hr = dev->CreateVertexBuffer(length, usage, fvf, (D3DPOOL)pool, (IDirect3DVertexBuffer8**)&buf);
#else #else
hr = IDirect3DDevice8_CreateVertexBuffer(dev, length, usage, fvf, pool, hr = IDirect3DDevice8_CreateVertexBuffer(dev, length, usage, fvf,
(D3DPOOL)pool,
(struct IDirect3DVertexBuffer8**)&buf); (struct IDirect3DVertexBuffer8**)&buf);
#endif #endif
#endif #endif
@ -2470,7 +2479,7 @@ static bool d3d_create_device_internal(
focus_window, focus_window,
behavior_flags, behavior_flags,
d3dpp, d3dpp,
dev))) (IDirect3DDevice9**)dev)))
return true; return true;
#else #else
if (SUCCEEDED(IDirect3D9_CreateDevice(d3d, if (SUCCEEDED(IDirect3D9_CreateDevice(d3d,
@ -2809,7 +2818,8 @@ bool d3dx_create_font_indirect(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #ifdef __cplusplus
if (SUCCEEDED(D3DCreateFontIndirect( if (SUCCEEDED(D3DCreateFontIndirect(
dev, (D3DXFONT_DESC*)desc, font_data))) dev, (D3DXFONT_DESC*)desc,
(struct ID3DXFont**)font_data)))
return true; return true;
#else #else
if (SUCCEEDED(D3DCreateFontIndirect( if (SUCCEEDED(D3DCreateFontIndirect(

3
tasks/task_autodetect.c
View File

@ -49,10 +49,13 @@
#include <ks.h> #include <ks.h>
#include <setupapi.h> #include <setupapi.h>
#include <hidsdi.h> #include <hidsdi.h>
#ifndef __cplusplus
/* Why doesn't including cguid.h work to get a GUID_NULL instead? */ /* Why doesn't including cguid.h work to get a GUID_NULL instead? */
__attribute__((weak)) __attribute__((weak))
const GUID GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}; const GUID GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
#endif #endif
#endif
#include "../input/input_driver.h" #include "../input/input_driver.h"
#include "../input/include/blissbox.h" #include "../input/include/blissbox.h"