From dbbc764529c8e157e75747d8e1c2e38d06a436ee Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 8 Jun 2014 02:45:07 +0200 Subject: [PATCH] (D3D) Go through macro for D3DDevice_CreateVertexBuffer --- gfx/d3d9/d3d.cpp | 16 ++-------------- gfx/d3d9/d3d9.hpp | 1 + gfx/d3d9/render_chain.cpp | 3 +-- xdk/xdk_d3d.cpp | 8 ++------ xdk/xdk_defines.h | 3 +++ 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp index 5614061124..aa749d86ec 100644 --- a/gfx/d3d9/d3d.cpp +++ b/gfx/d3d9/d3d.cpp @@ -526,20 +526,8 @@ static void d3d_overlay_render(void *data, overlay_t *overlay) if (!overlay->vert_buf) { - d3d->dev->CreateVertexBuffer( - sizeof(vert), -#ifdef _XBOX - 0, -#else - d3d->dev->GetSoftwareVertexProcessing() ? D3DUSAGE_SOFTWAREPROCESSING : 0, -#endif - 0, - D3DPOOL_MANAGED, - &overlay->vert_buf -#ifndef _XBOX1 - ,NULL -#endif - ); + D3DDevice_CreateVertexBuffers(d3d->dev, sizeof(vert), + d3d->dev->GetSoftwareVertexProcessing() ? D3DUSAGE_SOFTWAREPROCESSING : 0, 0, D3DPOOL_MANAGED, &overlay->vert_buf, NULL); } for (unsigned i = 0; i < 4; i++) diff --git a/gfx/d3d9/d3d9.hpp b/gfx/d3d9/d3d9.hpp index c47fffc202..1c9f836ce4 100644 --- a/gfx/d3d9/d3d9.hpp +++ b/gfx/d3d9/d3d9.hpp @@ -76,6 +76,7 @@ class RenderChain; RARCH_ERR("[D3D]: Present() failed.\n"); \ d3d->needs_restore = true; \ } +#define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) device->CreateVertexBuffer(Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, NULL) #endif diff --git a/gfx/d3d9/render_chain.cpp b/gfx/d3d9/render_chain.cpp index f82040d2f8..2b890c844b 100644 --- a/gfx/d3d9/render_chain.cpp +++ b/gfx/d3d9/render_chain.cpp @@ -152,8 +152,7 @@ bool renderchain_add_pass(void *data, const LinkInfo *info) if (!renderchain_init_shader_fvf(chain, pass)) return false; - if (FAILED(d3dr->CreateVertexBuffer( - 4 * sizeof(Vertex), + if (FAILED(D3DDevice_CreateVertexBuffers(d3dr, 4 * sizeof(Vertex), d3dr->GetSoftwareVertexProcessing() ? D3DUSAGE_SOFTWAREPROCESSING : 0, 0, D3DPOOL_DEFAULT, diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index ef21f3406a..9a904e0cd3 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -266,12 +266,8 @@ static bool renderchain_create_first_pass(void *data, const video_info_t *info) d3d_video_t *chain = (d3d_video_t*)data; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; - ret = d3dr->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats), - D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, &chain->vertex_buf -#ifdef _XBOX360 - ,NULL -#endif - ); + ret = D3DDevice_CreateVertexBuffers(d3dr, 4 * sizeof(DrawVerticeFormats), + D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, &chain->vertex_buf, NULL); if (FAILED(ret)) return false; diff --git a/xdk/xdk_defines.h b/xdk/xdk_defines.h index 2684188b78..e02ccf9e3e 100644 --- a/xdk/xdk_defines.h +++ b/xdk/xdk_defines.h @@ -53,6 +53,8 @@ #define D3DDevice_SetSamplerState_MagFilter(device, sampler, value) SetSamplerState_function(device, sampler, D3DTSS_MAGFILTER, value) #define D3DDevice_SetSamplerState_AddressU(device, sampler, value) SetSamplerState_function(device, sampler, D3DTSS_ADDRESSU, value) #define D3DDevice_SetSamplerState_AddressV(device, sampler, value) SetSamplerState_function(device, sampler, D3DTSS_ADDRESSV, value) +#define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) IDirect3DDevice8_CreateVertexBuffer(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer) + #define D3DLOCK_NOSYSLOCK (0) @@ -87,6 +89,7 @@ pendingMask3 = D3DTAG_MASKENCODE(D3DTAG_START(D3DTAG_FETCHCONSTANTS) + fetchConstant, D3DTAG_START(D3DTAG_FETCHCONSTANTS) + fetchConstant); \ D3DDevice_SetTexture(device, Stage, pTexture, pendingMask3) +#define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) IDirect3DDevice8_CreateVertexBuffer(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer) #define RD3DDevice_DrawPrimitive(device, PrimitiveType, StartVertex, PrimitiveCount) D3DDevice_DrawVertices(device, PrimitiveType, StartVertex, D3DVERTEXCOUNT(PrimitiveType, PrimitiveCount)) #define RD3DDevice_Clear(device, Count, pRects, Flags, Color, Z, Stencil) D3DDevice_Clear(device, Count, pRects, Flags, Color, Z, Stencil, false) #define RD3DDevice_SetViewport(device, viewport) D3DDevice_SetViewport(device, viewport)