mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 05:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make code compatible when compiled as C++

Browse Source
This commit is contained in:
twinaphex 2018-02-04 21:50:05 +01:00
parent 3ff3cada71
commit 534e5bbf34
4 changed files with 118 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
gfx/common/d3d_common.c
View File

@ -358,7 +358,7 @@ bool d3d_check_device_type(void *_d3d,
LPDIRECT3D9 d3d = (LPDIRECT3D9)_d3d; LPDIRECT3D9 d3d = (LPDIRECT3D9)_d3d;
if (!d3d) if (!d3d)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (FAILED(d3d->CheckDeviceType( if (FAILED(d3d->CheckDeviceType(
0, 0,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
@ -427,7 +427,7 @@ bool d3d_get_adapter_display_mode(
return false; return false;
#ifdef _XBOX #ifdef _XBOX
return true; return true;
#elif defined(__cplusplus) #elif defined(__cplusplus) && !defined(CINTERFACE)
if (FAILED(d3d->GetAdapterDisplayMode(idx, (D3DDISPLAYMODE*)display_mode))) if (FAILED(d3d->GetAdapterDisplayMode(idx, (D3DDISPLAYMODE*)display_mode)))
return false; return false;
#else #else
@ -469,7 +469,7 @@ bool d3d_swap(void *data, void *_dev)
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
#ifdef _XBOX #ifdef _XBOX
dev->Present(NULL, NULL, NULL, NULL); dev->Present(NULL, NULL, NULL, NULL);
#else #else
@ -522,7 +522,7 @@ void d3d_set_transform(void *_dev,
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
#ifndef _XBOX #ifndef _XBOX
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetTransform((D3DTRANSFORMSTATETYPE)state, matrix); dev->SetTransform((D3DTRANSFORMSTATETYPE)state, matrix);
#else #else
IDirect3DDevice9_SetTransform(dev, (D3DTRANSFORMSTATETYPE)state, matrix); IDirect3DDevice9_SetTransform(dev, (D3DTRANSFORMSTATETYPE)state, matrix);
@ -558,7 +558,7 @@ bool d3d_texture_get_level_desc(void *_tex,
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex; LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(tex->GetLevelDesc(idx, (D3DSURFACE_DESC*)_ppsurface_level))) if (SUCCEEDED(tex->GetLevelDesc(idx, (D3DSURFACE_DESC*)_ppsurface_level)))
return true; return true;
#else #else
@ -606,7 +606,7 @@ bool d3d_texture_get_surface_level(void *_tex,
LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex; LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex;
if (!tex) if (!tex)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(tex->GetSurfaceLevel(idx, (IDirect3DSurface9**)_ppsurface_level))) if (SUCCEEDED(tex->GetSurfaceLevel(idx, (IDirect3DSurface9**)_ppsurface_level)))
return true; return true;
#else #else
@ -715,7 +715,7 @@ void *d3d_texture_new(void *_dev,
if (want_mipmap) if (want_mipmap)
usage |= D3DUSAGE_AUTOGENMIPMAP; usage |= D3DUSAGE_AUTOGENMIPMAP;
#endif #endif
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
hr = dev->CreateTexture( hr = dev->CreateTexture(
width, height, miplevels, usage, width, height, miplevels, usage,
(D3DFORMAT)format, (D3DFORMAT)format,
@ -768,7 +768,7 @@ void d3d_texture_free(void *_tex)
LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex; LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex;
if (!tex) if (!tex)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
tex->Release(); tex->Release();
#else #else
IDirect3DTexture9_Release(tex); IDirect3DTexture9_Release(tex);
@ -806,7 +806,7 @@ bool d3d_surface_lock_rect(void *data, void *data2)
LPDIRECT3DSURFACE9 surf = (LPDIRECT3DSURFACE9)data; LPDIRECT3DSURFACE9 surf = (LPDIRECT3DSURFACE9)data;
if (!surf) if (!surf)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (FAILED(surf->LockRect((D3DLOCKED_RECT*)data2, NULL, D3DLOCK_READONLY))) if (FAILED(surf->LockRect((D3DLOCKED_RECT*)data2, NULL, D3DLOCK_READONLY)))
return false; return false;
#else #else
@ -855,7 +855,7 @@ void d3d_surface_unlock_rect(void *data)
LPDIRECT3DSURFACE9 surf = (LPDIRECT3DSURFACE9)data; LPDIRECT3DSURFACE9 surf = (LPDIRECT3DSURFACE9)data;
if (!surf) if (!surf)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
surf->UnlockRect(); surf->UnlockRect();
#else #else
IDirect3DSurface9_UnlockRect(surf); IDirect3DSurface9_UnlockRect(surf);
@ -893,7 +893,7 @@ void d3d_surface_free(void *data)
LPDIRECT3DSURFACE9 surf = (LPDIRECT3DSURFACE9)data; LPDIRECT3DSURFACE9 surf = (LPDIRECT3DSURFACE9)data;
if (!surf) if (!surf)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
surf->Release(); surf->Release();
#else #else
IDirect3DSurface9_Release(surf); IDirect3DSurface9_Release(surf);
@ -930,7 +930,7 @@ void d3d_vertex_declaration_free(void *data)
{ {
case GFX_CTX_DIRECT3D9_API: case GFX_CTX_DIRECT3D9_API:
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
{ {
LPDIRECT3DVERTEXDECLARATION9 vertex_decl = LPDIRECT3DVERTEXDECLARATION9 vertex_decl =
(LPDIRECT3DVERTEXDECLARATION9)data; (LPDIRECT3DVERTEXDECLARATION9)data;
@ -961,7 +961,7 @@ bool d3d_vertex_declaration_new(void *_dev,
const D3DVERTEXELEMENT9 *vertex_elements = (const D3DVERTEXELEMENT9*)vertex_data; const D3DVERTEXELEMENT9 *vertex_elements = (const D3DVERTEXELEMENT9*)vertex_data;
LPDIRECT3DVERTEXDECLARATION9 **vertex_decl = (LPDIRECT3DVERTEXDECLARATION9**)decl_data; LPDIRECT3DVERTEXDECLARATION9 **vertex_decl = (LPDIRECT3DVERTEXDECLARATION9**)decl_data;
#if defined(__cplusplus) #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(dev->CreateVertexDeclaration(vertex_elements, (IDirect3DVertexDeclaration9**)vertex_decl))) if (SUCCEEDED(dev->CreateVertexDeclaration(vertex_elements, (IDirect3DVertexDeclaration9**)vertex_decl)))
return true; return true;
#else #else
@ -996,7 +996,7 @@ void *d3d_vertex_buffer_new(void *_dev,
if (usage == 0) if (usage == 0)
{ {
#ifndef _XBOX #ifndef _XBOX
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev->GetSoftwareVertexProcessing()) if (dev->GetSoftwareVertexProcessing())
usage = D3DUSAGE_SOFTWAREPROCESSING; usage = D3DUSAGE_SOFTWAREPROCESSING;
#else #else
@ -1006,7 +1006,7 @@ void *d3d_vertex_buffer_new(void *_dev,
#endif #endif
} }
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
hr = dev->CreateVertexBuffer(length, usage, fvf, hr = dev->CreateVertexBuffer(length, usage, fvf,
(D3DPOOL)pool, (D3DPOOL)pool,
(LPDIRECT3DVERTEXBUFFER9*)&buf, NULL); (LPDIRECT3DVERTEXBUFFER9*)&buf, NULL);
@ -1055,7 +1055,7 @@ void d3d_vertex_buffer_unlock(void *vertbuf_ptr)
if (!vertbuf) if (!vertbuf)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
vertbuf->Unlock(); vertbuf->Unlock();
#else #else
IDirect3DVertexBuffer9_Unlock(vertbuf); IDirect3DVertexBuffer9_Unlock(vertbuf);
@ -1097,7 +1097,7 @@ void *d3d_vertex_buffer_lock(void *vertbuf_ptr)
LPDIRECT3DVERTEXBUFFER9 vertbuf = (LPDIRECT3DVERTEXBUFFER9)vertbuf_ptr; LPDIRECT3DVERTEXBUFFER9 vertbuf = (LPDIRECT3DVERTEXBUFFER9)vertbuf_ptr;
if (!vertbuf) if (!vertbuf)
return NULL; return NULL;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
vertbuf->Lock(0, 0, &buf, 0); vertbuf->Lock(0, 0, &buf, 0);
#else #else
IDirect3DVertexBuffer9_Lock(vertbuf, 0, 0, &buf, 0); IDirect3DVertexBuffer9_Lock(vertbuf, 0, 0, &buf, 0);
@ -1139,7 +1139,7 @@ void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration)
if (vertex_data) if (vertex_data)
{ {
LPDIRECT3DVERTEXBUFFER9 buf = (LPDIRECT3DVERTEXBUFFER9)vertex_data; LPDIRECT3DVERTEXBUFFER9 buf = (LPDIRECT3DVERTEXBUFFER9)vertex_data;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
buf->Release(); buf->Release();
#else #else
IDirect3DVertexBuffer9_Release(buf); IDirect3DVertexBuffer9_Release(buf);
@ -1189,7 +1189,7 @@ void d3d_set_stream_source(void *_dev, unsigned stream_no,
LPDIRECT3DVERTEXBUFFER9 stream_vertbuf = (LPDIRECT3DVERTEXBUFFER9)stream_vertbuf_ptr; LPDIRECT3DVERTEXBUFFER9 stream_vertbuf = (LPDIRECT3DVERTEXBUFFER9)stream_vertbuf_ptr;
if (!stream_vertbuf) if (!stream_vertbuf)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetStreamSource(stream_no, stream_vertbuf, offset_bytes, stride); dev->SetStreamSource(stream_no, stream_vertbuf, offset_bytes, stride);
#else #else
IDirect3DDevice9_SetStreamSource(dev, stream_no, stream_vertbuf, IDirect3DDevice9_SetStreamSource(dev, stream_no, stream_vertbuf,
@ -1236,7 +1236,7 @@ bool d3d_device_create_offscreen_plain_surface(
#ifndef _XBOX #ifndef _XBOX
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(dev->CreateOffscreenPlainSurface(width, height, if (SUCCEEDED(dev->CreateOffscreenPlainSurface(width, height,
(D3DFORMAT)format, (D3DPOOL)pool, (D3DFORMAT)format, (D3DPOOL)pool,
(LPDIRECT3DSURFACE9*)surf_data, (LPDIRECT3DSURFACE9*)surf_data,
@ -1274,7 +1274,7 @@ static void d3d_set_texture_stage_state(void *_dev,
#ifndef _XBOX #ifndef _XBOX
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev->SetTextureStageState(sampler, (D3DTEXTURESTAGESTATETYPE)type, value) != D3D_OK) if (dev->SetTextureStageState(sampler, (D3DTEXTURESTAGESTATETYPE)type, value) != D3D_OK)
RARCH_ERR("SetTextureStageState call failed, sampler: %d, value: %d, type: %d\n", sampler, value, type); RARCH_ERR("SetTextureStageState call failed, sampler: %d, value: %d, type: %d\n", sampler, value, type);
#else #else
@ -1314,7 +1314,7 @@ void d3d_set_sampler_address_u(void *_dev,
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetSamplerState(sampler, D3DSAMP_ADDRESSU, value); dev->SetSamplerState(sampler, D3DSAMP_ADDRESSU, value);
#else #else
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSU, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSU, value);
@ -1345,7 +1345,7 @@ void d3d_set_sampler_address_v(void *_dev,
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetSamplerState(sampler, D3DSAMP_ADDRESSV, value); dev->SetSamplerState(sampler, D3DSAMP_ADDRESSV, value);
#else #else
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSV, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSV, value);
@ -1378,7 +1378,7 @@ void d3d_set_sampler_minfilter(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetSamplerState(sampler, D3DSAMP_MINFILTER, value); dev->SetSamplerState(sampler, D3DSAMP_MINFILTER, value);
#else #else
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MINFILTER, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MINFILTER, value);
@ -1408,7 +1408,7 @@ void d3d_set_sampler_magfilter(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetSamplerState(sampler, D3DSAMP_MAGFILTER, value); dev->SetSamplerState(sampler, D3DSAMP_MAGFILTER, value);
#else #else
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MAGFILTER, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MAGFILTER, value);
@ -1460,7 +1460,7 @@ bool d3d_begin_scene(void *_dev)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (FAILED(dev->BeginScene())) if (FAILED(dev->BeginScene()))
return false; return false;
#else #else
@ -1516,7 +1516,7 @@ void d3d_end_scene(void *_dev)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->EndScene(); dev->EndScene();
#else #else
IDirect3DDevice9_EndScene(dev); IDirect3DDevice9_EndScene(dev);
@ -1555,7 +1555,7 @@ static void d3d_draw_primitive_internal(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->DrawPrimitive(type, start, count); dev->DrawPrimitive(type, start, count);
#else #else
IDirect3DDevice9_DrawPrimitive(dev, type, start, count); IDirect3DDevice9_DrawPrimitive(dev, type, start, count);
@ -1605,7 +1605,7 @@ void d3d_clear(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->Clear(count, (const D3DRECT*)rects, flags, color, z, stencil); dev->Clear(count, (const D3DRECT*)rects, flags, color, z, stencil);
#else #else
IDirect3DDevice9_Clear(dev, count, (const D3DRECT*)rects, flags, IDirect3DDevice9_Clear(dev, count, (const D3DRECT*)rects, flags,
@ -1650,7 +1650,7 @@ bool d3d_device_get_render_target_data(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(dev->GetRenderTargetData(src, dst))) if (SUCCEEDED(dev->GetRenderTargetData(src, dst)))
return true; return true;
#else #else
@ -1682,7 +1682,7 @@ bool d3d_device_get_render_target(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(dev->GetRenderTarget(idx, if (SUCCEEDED(dev->GetRenderTarget(idx,
(LPDIRECT3DSURFACE9*)data))) (LPDIRECT3DSURFACE9*)data)))
return true; return true;
@ -1735,7 +1735,7 @@ bool d3d_lock_rectangle(void *_tex,
LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex; LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex;
if (!tex) if (!tex)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (FAILED(tex->LockRect(level, lr, rect, flags))) if (FAILED(tex->LockRect(level, lr, rect, flags)))
return false; return false;
#else #else
@ -1783,7 +1783,7 @@ void d3d_unlock_rectangle(void *_tex)
LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex; LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)_tex;
if (!tex) if (!tex)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
tex->UnlockRect(0); tex->UnlockRect(0);
#else #else
IDirect3DTexture9_UnlockRect(tex, 0); IDirect3DTexture9_UnlockRect(tex, 0);
@ -1834,7 +1834,7 @@ void d3d_set_viewports(void *_dev, void *_vp)
D3DVIEWPORT9 *vp = (D3DVIEWPORT9*)_vp; D3DVIEWPORT9 *vp = (D3DVIEWPORT9*)_vp;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetViewport(vp); dev->SetViewport(vp);
#else #else
IDirect3DDevice9_SetViewport(dev, vp); IDirect3DDevice9_SetViewport(dev, vp);
@ -1875,7 +1875,7 @@ void d3d_set_texture(void *_dev, unsigned sampler,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev || !tex) if (!dev || !tex)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetTexture(sampler, tex); dev->SetTexture(sampler, tex);
#else #else
IDirect3DDevice9_SetTexture(dev, sampler, IDirect3DDevice9_SetTexture(dev, sampler,
@ -1917,7 +1917,7 @@ void d3d_free_vertex_shader(void *_dev, void *data)
IDirect3DVertexShader9 *vs = (IDirect3DVertexShader9*)data; IDirect3DVertexShader9 *vs = (IDirect3DVertexShader9*)data;
if (!dev || !vs) if (!dev || !vs)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
vs->Release(); vs->Release();
#else #else
IDirect3DVertexShader9_Release(vs); IDirect3DVertexShader9_Release(vs);
@ -1943,7 +1943,7 @@ void d3d_free_pixel_shader(void *_dev, void *data)
IDirect3DPixelShader9 *ps = (IDirect3DPixelShader9*)data; IDirect3DPixelShader9 *ps = (IDirect3DPixelShader9*)data;
if (!dev || !ps) if (!dev || !ps)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
ps->Release(); ps->Release();
#else #else
IDirect3DPixelShader9_Release(ps); IDirect3DPixelShader9_Release(ps);
@ -1969,7 +1969,7 @@ bool d3d_create_vertex_shader(void *_dev, const DWORD *a, void **b)
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#if defined(__cplusplus) #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev->CreateVertexShader(a, (IDirect3DVertexShader9**)b) == D3D_OK) if (dev->CreateVertexShader(a, (IDirect3DVertexShader9**)b) == D3D_OK)
return true; return true;
#else #else
@ -2000,7 +2000,7 @@ bool d3d_create_pixel_shader(void *_dev, const DWORD *a, void **b)
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev->CreatePixelShader(a, (IDirect3DPixelShader9**)b) == D3D_OK) if (dev->CreatePixelShader(a, (IDirect3DPixelShader9**)b) == D3D_OK)
return true; return true;
#else #else
@ -2031,7 +2031,7 @@ bool d3d_set_pixel_shader(void *_dev, void *data)
LPDIRECT3DPIXELSHADER9 d3dps = (LPDIRECT3DPIXELSHADER9)data; LPDIRECT3DPIXELSHADER9 d3dps = (LPDIRECT3DPIXELSHADER9)data;
if (!dev || !d3dps) if (!dev || !d3dps)
return false; return false;
#if defined(__cplusplus) #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev->SetPixelShader(d3dps) == D3D_OK) if (dev->SetPixelShader(d3dps) == D3D_OK)
return true; return true;
#else #else
@ -2066,7 +2066,7 @@ bool d3d_set_vertex_shader(void *_dev, unsigned index,
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
LPDIRECT3DVERTEXSHADER9 shader = (LPDIRECT3DVERTEXSHADER9)data; LPDIRECT3DVERTEXSHADER9 shader = (LPDIRECT3DVERTEXSHADER9)data;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev->SetVertexShader(shader) != D3D_OK) if (dev->SetVertexShader(shader) != D3D_OK)
return false; return false;
#else #else
@ -2114,7 +2114,7 @@ bool d3d_set_vertex_shader_constantf(void *_dev,
{ {
#if defined(HAVE_D3D9) #if defined(HAVE_D3D9)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
#ifdef _XBOX #ifdef _XBOX
dev->SetVertexShaderConstantF( dev->SetVertexShaderConstantF(
start_register, constant_data, vector4f_count); start_register, constant_data, vector4f_count);
@ -2170,7 +2170,7 @@ bool d3d_get_render_state(void *data, INT32 state, DWORD *value)
{ {
#ifdef HAVE_D3D9 #ifdef HAVE_D3D9
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (dev && dev->GetRenderState((D3DRENDERSTATETYPE)state, value) == D3D_OK) if (dev && dev->GetRenderState((D3DRENDERSTATETYPE)state, value) == D3D_OK)
return true; return true;
#else #else
@ -2219,7 +2219,7 @@ void d3d_set_render_state(void *data, INT32 state, DWORD value)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetRenderState((D3DRENDERSTATETYPE)state, value); dev->SetRenderState((D3DRENDERSTATETYPE)state, value);
#else #else
IDirect3DDevice9_SetRenderState(dev, (D3DRENDERSTATETYPE)state, value); IDirect3DDevice9_SetRenderState(dev, (D3DRENDERSTATETYPE)state, value);
@ -2270,7 +2270,7 @@ void d3d_device_set_render_target(void *_dev, unsigned idx,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetRenderTarget(idx, surf); dev->SetRenderTarget(idx, surf);
#else #else
IDirect3DDevice9_SetRenderTarget(dev, idx, surf); IDirect3DDevice9_SetRenderTarget(dev, idx, surf);
@ -2354,7 +2354,7 @@ void d3d_set_vertex_declaration(void *data, void *vertex_data)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
if (!dev) if (!dev)
return; return;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->SetVertexDeclaration((LPDIRECT3DVERTEXDECLARATION9)vertex_data); dev->SetVertexDeclaration((LPDIRECT3DVERTEXDECLARATION9)vertex_data);
#else #else
IDirect3DDevice9_SetVertexDeclaration(dev, (LPDIRECT3DVERTEXDECLARATION9)vertex_data); IDirect3DDevice9_SetVertexDeclaration(dev, (LPDIRECT3DVERTEXDECLARATION9)vertex_data);
@ -2381,7 +2381,7 @@ static bool d3d_reset_internal(void *data,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
if (!dev) if (!dev)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if ((dev->Reset(d3dpp) == D3D_OK)) if ((dev->Reset(d3dpp) == D3D_OK))
return true; return true;
#else #else
@ -2426,7 +2426,7 @@ static HRESULT d3d_test_cooperative_level(void *data)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
if (!dev) if (!dev)
return E_FAIL; return E_FAIL;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
return dev->TestCooperativeLevel(); return dev->TestCooperativeLevel();
#else #else
return IDirect3DDevice9_TestCooperativeLevel(dev); return IDirect3DDevice9_TestCooperativeLevel(dev);
@ -2476,7 +2476,7 @@ static bool d3d_create_device_internal(
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data;
if (!dev) if (!dev)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(d3d->CreateDevice( if (SUCCEEDED(d3d->CreateDevice(
cur_mon_id, cur_mon_id,
D3DDEVTYPE_HAL, D3DDEVTYPE_HAL,
@ -2602,7 +2602,7 @@ bool d3d_device_get_backbuffer(void *_dev,
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (!dev) if (!dev)
return false; return false;
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
if (SUCCEEDED(dev->GetBackBuffer( if (SUCCEEDED(dev->GetBackBuffer(
swapchain_idx, idx, swapchain_idx, idx,
(D3DBACKBUFFER_TYPE)backbuffer_type, (D3DBACKBUFFER_TYPE)backbuffer_type,
@ -2658,7 +2658,7 @@ void d3d_device_free(void *_dev, void *_pd3d)
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev; LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)_dev;
if (dev) if (dev)
{ {
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
dev->Release(); dev->Release();
#else #else
IDirect3DDevice9_Release(dev); IDirect3DDevice9_Release(dev);
@ -2667,7 +2667,7 @@ void d3d_device_free(void *_dev, void *_pd3d)
if (pd3d) if (pd3d)
{ {
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
pd3d->Release(); pd3d->Release();
#else #else
IDirect3D9_Release(pd3d); IDirect3D9_Release(pd3d);

2
gfx/display_servers/dispserv_win32.c
View File

@ -42,7 +42,7 @@ static ITaskbarList3 *g_taskbarList = NULL;
/* MSVC really doesn't want CINTERFACE to be used with shobjidl for some reason, but since we use C++ mode, /* MSVC really doesn't want CINTERFACE to be used with shobjidl for some reason, but since we use C++ mode,
* we need a workaround... so use the names of the COBJMACROS functions instead. */ * we need a workaround... so use the names of the COBJMACROS functions instead. */
#ifdef __cplusplus #if defined(__cplusplus) && !defined(CINTERFACE)
#define ITaskbarList3_Release(x) g_taskbarList->Release() #define ITaskbarList3_Release(x) g_taskbarList->Release()
#define ITaskbarList3_SetProgressState(a, b, c) g_taskbarList->SetProgressState(b, c) #define ITaskbarList3_SetProgressState(a, b, c) g_taskbarList->SetProgressState(b, c)
#define ITaskbarList3_SetProgressValue(a, b, c, d) g_taskbarList->SetProgressValue(b, c, d) #define ITaskbarList3_SetProgressValue(a, b, c, d) g_taskbarList->SetProgressValue(b, c, d)

70
gfx/drivers/d3d10.c
View File

@ -166,13 +166,19 @@ d3d10_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
matrix_4x4_ortho(d3d10->mvp_no_rot, 0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f); matrix_4x4_ortho(d3d10->mvp_no_rot, 0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f);
{ {
D3D10_BUFFER_DESC desc = { D3D10_BUFFER_DESC desc;
.ByteWidth = sizeof(math_matrix_4x4), D3D10_SUBRESOURCE_DATA ubo_data;
.Usage = D3D10_USAGE_DYNAMIC,
.BindFlags = D3D10_BIND_CONSTANT_BUFFER, desc.ByteWidth = sizeof(math_matrix_4x4);
.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE, desc.Usage = D3D10_USAGE_DYNAMIC;
}; desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER;
D3D10_SUBRESOURCE_DATA ubo_data = { &d3d10->mvp_no_rot }; desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE;
desc.MiscFlags = 0;
ubo_data.pSysMem = &d3d10->mvp_no_rot;
ubo_data.SysMemPitch = 0;
ubo_data.SysMemSlicePitch = 0;
D3D10CreateBuffer(d3d10->device, &desc, &ubo_data, &d3d10->ubo); D3D10CreateBuffer(d3d10->device, &desc, &ubo_data, &d3d10->ubo);
D3D10CreateBuffer(d3d10->device, &desc, NULL, &d3d10->frame.ubo); D3D10CreateBuffer(d3d10->device, &desc, NULL, &d3d10->frame.ubo);
} }
@ -212,13 +218,19 @@ d3d10_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
}; };
{ {
D3D10_BUFFER_DESC desc = { D3D10_SUBRESOURCE_DATA vertexData;
.ByteWidth = sizeof(vertices), D3D10_BUFFER_DESC desc;
.Usage = D3D10_USAGE_DYNAMIC,
.BindFlags = D3D10_BIND_VERTEX_BUFFER, desc.ByteWidth = sizeof(vertices);
.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE, desc.Usage = D3D10_USAGE_DYNAMIC;
}; desc.BindFlags = D3D10_BIND_VERTEX_BUFFER;
D3D10_SUBRESOURCE_DATA vertexData = { vertices }; desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE;
desc.MiscFlags = 0;
vertexData.pSysMem = vertices;
vertexData.SysMemPitch = 0;
vertexData.SysMemSlicePitch = 0;
D3D10CreateBuffer(d3d10->device, &desc, &vertexData, &d3d10->frame.vbo); D3D10CreateBuffer(d3d10->device, &desc, &vertexData, &d3d10->frame.vbo);
desc.Usage = D3D10_USAGE_IMMUTABLE; desc.Usage = D3D10_USAGE_IMMUTABLE;
desc.CPUAccessFlags = 0; desc.CPUAccessFlags = 0;
@ -264,17 +276,25 @@ d3d10_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
D3D10SetPShader(d3d10->device, d3d10->ps); D3D10SetPShader(d3d10->device, d3d10->ps);
{ {
D3D10_BLEND_DESC blend_desc = { unsigned k;
.AlphaToCoverageEnable = FALSE, D3D10_BLEND_DESC blend_desc;
.BlendEnable = { TRUE },
D3D10_BLEND_SRC_ALPHA,
D3D10_BLEND_INV_SRC_ALPHA,
D3D10_BLEND_OP_ADD, for (k = 0; k < 8; k++)
D3D10_BLEND_SRC_ALPHA, {
D3D10_BLEND_INV_SRC_ALPHA, blend_desc.BlendEnable[k] = TRUE;
D3D10_BLEND_OP_ADD, blend_desc.RenderTargetWriteMask[k] = D3D10_COLOR_WRITE_ENABLE_ALL;
{ D3D10_COLOR_WRITE_ENABLE_ALL }, }
};
blend_desc.AlphaToCoverageEnable = FALSE;
blend_desc.SrcBlend = D3D10_BLEND_SRC_ALPHA;
blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA;
blend_desc.BlendOp = D3D10_BLEND_OP_ADD;
blend_desc.SrcBlendAlpha = D3D10_BLEND_SRC_ALPHA;
blend_desc.DestBlendAlpha = D3D10_BLEND_INV_SRC_ALPHA;
blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD;
D3D10CreateBlendState(d3d10->device, &blend_desc, &d3d10->blend_enable); D3D10CreateBlendState(d3d10->device, &blend_desc, &d3d10->blend_enable);
blend_desc.BlendEnable[0] = FALSE; blend_desc.BlendEnable[0] = FALSE;
D3D10CreateBlendState(d3d10->device, &blend_desc, &d3d10->blend_disable); D3D10CreateBlendState(d3d10->device, &blend_desc, &d3d10->blend_disable);

33
gfx/drivers/d3d11.c
View File

@ -287,12 +287,13 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
for (j = 0; j < SLANG_CBUFFER_MAX; j++) for (j = 0; j < SLANG_CBUFFER_MAX; j++)
{ {
D3D11_BUFFER_DESC desc = { D3D11_BUFFER_DESC desc;
.ByteWidth = d3d11->pass[i].semantics.cbuffers[j].size, desc.ByteWidth = d3d11->pass[i].semantics.cbuffers[j].size;
.Usage = D3D11_USAGE_DYNAMIC, desc.Usage = D3D11_USAGE_DYNAMIC;
.BindFlags = D3D11_BIND_CONSTANT_BUFFER, desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE, desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
}; desc.MiscFlags = 0;
desc.StructureByteStride = 0;
if (!desc.ByteWidth) if (!desc.ByteWidth)
continue; continue;
@ -496,13 +497,19 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
d3d11->ubo_values.OutputSize.height = d3d11->viewport.Height; d3d11->ubo_values.OutputSize.height = d3d11->viewport.Height;
{ {
D3D11_BUFFER_DESC desc = { D3D11_SUBRESOURCE_DATA ubo_data;
.ByteWidth = sizeof(d3d11->ubo_values), D3D11_BUFFER_DESC desc;
.Usage = D3D11_USAGE_DYNAMIC, desc.ByteWidth = sizeof(d3d11->ubo_values);
.BindFlags = D3D11_BIND_CONSTANT_BUFFER, desc.Usage = D3D11_USAGE_DYNAMIC;
.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE, desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
}; desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
D3D11_SUBRESOURCE_DATA ubo_data = { &d3d11->ubo_values.mvp }; desc.MiscFlags = 0;
desc.StructureByteStride = 0;
ubo_data.pSysMem = &d3d11->ubo_values.mvp;
ubo_data.SysMemPitch = 0;
ubo_data.SysMemSlicePitch = 0;
D3D11CreateBuffer(d3d11->device, &desc, &ubo_data, &d3d11->ubo); D3D11CreateBuffer(d3d11->device, &desc, &ubo_data, &d3d11->ubo);
D3D11CreateBuffer(d3d11->device, &desc, NULL, &d3d11->frame.ubo); D3D11CreateBuffer(d3d11->device, &desc, NULL, &d3d11->frame.ubo);
} }