mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanups - only go through d3d_vertex_buffer_new

Browse Source
This commit is contained in:
twinaphex 2014-09-13 18:22:56 +02:00
parent 633c05d677
commit 6f05da2208
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/d3d9/d3d.hpp
View File

@ -59,10 +59,6 @@
#include <string>
#include <vector>
#ifndef _XBOX
#define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) device->CreateVertexBuffer(Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, NULL)
#endif
#ifdef HAVE_OVERLAY
typedef struct
{

17
gfx/d3d9/render_chain.cpp
View File

@ -355,14 +355,15 @@ bool renderchain_create_first_pass(void *data, const LinkInfo *info,
chain->prev.last_width[i] = 0;
chain->prev.last_height[i] = 0;
if (FAILED(d3dr->CreateVertexBuffer(
4 * sizeof(Vertex),
d3dr->GetSoftwareVertexProcessing()
? D3DUSAGE_SOFTWAREPROCESSING : 0,
0,
D3DPOOL_DEFAULT,
&chain->prev.vertex_buf[i],
NULL)))
chain->prev.vertex_buf[i] = d3d_vertex_buffer_new(
d3dr, 4 * sizeof(Vertex),
d3dr->GetSoftwareVertexProcessing()
? D3DUSAGE_SOFTWAREPROCESSING : 0,
0,
D3DPOOL_DEFAULT,
NULL);
if (!chain->prev.vertex_buf[i])
return false;
if (FAILED(d3dr->CreateTexture(info->tex_w, info->tex_h, 1, 0,

13
gfx/d3d9/render_chain_xdk.h
View File

@ -56,19 +56,22 @@ bool renderchain_init_shader_fvf(void *data, void *pass_)
return true;
}
static bool renderchain_create_first_pass(void *data, const video_info_t *info)
static bool renderchain_create_first_pass(void *data,
const video_info_t *info)
{
HRESULT ret;
d3d_video_t *chain = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev;
ret = D3DDevice_CreateVertexBuffers(d3dr, 4 * sizeof(Vertex),
D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, &chain->vertex_buf, NULL);
chain->vertex_buf = d3d_vertex_buffer_new(d3dr, 4 * sizeof(Vertex),
D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED,
NULL);
if (FAILED(ret))
if (!chain->vertex_buf)
return false;
ret = d3dr->CreateTexture(chain->tex_w, chain->tex_h, 1, 0, info->rgb32 ? D3DFMT_LIN_X8R8G8B8 : D3DFMT_LIN_R5G6B5,
ret = d3dr->CreateTexture(chain->tex_w, chain->tex_h, 1, 0,
info->rgb32 ? D3DFMT_LIN_X8R8G8B8 : D3DFMT_LIN_R5G6B5,
0, &chain->tex
#ifdef _XBOX360
, NULL

2
gfx/d3d9/xdk_defines.h
View File

@ -26,7 +26,6 @@
#define RD3DVertexBuffer_Lock(device, OffsetToLock, SizeToLock, ppbData, Flags) *ppbData = D3DVertexBuffer_Lock2(device, Flags) + OffsetToLock
#define RD3DVertexBuffer_Unlock(device)
#define RD3DDevice_Clear(device, Count, pRects, Flags, Color, Z, Stencil) D3DDevice_Clear(Count, pRects, Flags, Color, Z, Stencil)
#define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) IDirect3DDevice8_CreateVertexBuffer(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer)
#elif defined(_XBOX360)
/* XBox 360*/
@ -34,7 +33,6 @@
#define RD3DVertexBuffer_Lock(device, OffsetToLock, SizeToLock, ppbData, Flags) *ppbData = D3DVertexBuffer_Lock(device, OffsetToLock, SizeToLock, Flags)
#define RD3DVertexBuffer_Unlock(device) D3DVertexBuffer_Unlock(device)
#define D3DDevice_CreateVertexBuffers(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, pUnusedSharedHandle) IDirect3DDevice9_CreateVertexBuffer(device, Length, Usage, UnusedFVF, UnusedPool, ppVertexBuffer, NULL)
#define RD3DDevice_Clear(device, Count, pRects, Flags, Color, Z, Stencil) D3DDevice_Clear(device, Count, pRects, Flags, Color, Z, Stencil, false)
#endif