mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Rewrite create_vertex_buffer wrapper function

Browse Source
This commit is contained in:
twinaphex 2014-09-13 17:56:33 +02:00
parent 0de251079a
commit c4b35fb00d
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/d3d9/d3d.cpp
View File

@ -1239,10 +1239,12 @@ static void d3d_overlay_render(void *data, overlay_t *overlay)
if (!overlay->vert_buf) if (!overlay->vert_buf)
{ {
D3DDevice_CreateVertexBuffers(d3d->dev, sizeof(vert), overlay->vert_buf = (LPDIRECT3DVERTEXBUFFER)d3d_vertex_buffer_new(
d3d->dev->GetSoftwareVertexProcessing() ? d3d->dev, sizeof(vert), d3d->dev->GetSoftwareVertexProcessing() ?
D3DUSAGE_SOFTWAREPROCESSING : 0, 0, D3DPOOL_MANAGED, D3DUSAGE_SOFTWAREPROCESSING : 0, 0, D3DPOOL_MANAGED, NULL);
&overlay->vert_buf, NULL);
if (!overlay->vert_buf)
return;
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)

22
gfx/d3d9/d3d_wrapper.c
View File

@ -40,19 +40,27 @@ void d3d_swap(void *data, LPDIRECT3DDEVICE dev)
#endif #endif
} }
HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev, LPDIRECT3DVERTEXBUFFER d3d_vertex_buffer_new(LPDIRECT3DDEVICE dev,
unsigned length, unsigned usage, unsigned fvf, unsigned length, unsigned usage, unsigned fvf,
D3DPOOL pool, LPDIRECT3DVERTEXBUFFER vert_buf, void *handle) D3DPOOL pool, void *handle)
{ {
HRESULT hr;
LPDIRECT3DVERTEXBUFFER buf;
#if defined(_XBOX1) #if defined(_XBOX1)
return IDirect3DDevice8_CreateVertexBuffer(dev, length, usage, fvf, pool, hr = IDirect3DDevice8_CreateVertexBuffer(dev, length, usage, fvf, pool,
&vert_buf); &buf);
#elif defined(_XBOX360) #elif defined(_XBOX360)
return IDirect3DDevice9_CreateVertexBuffer(dev, length, usage, fvf, pool, hr = IDirect3DDevice9_CreateVertexBuffer(dev, length, usage, fvf, pool,
&vert_buf, NULL); &buf, NULL);
#else #else
return dev->CreateVertexBuffer(length, usage, fvf, pool, &vert_buf, NULL); hr = dev->CreateVertexBuffer(length, usage, fvf, pool, &buf, NULL);
#endif #endif
if (FAILED(hr))
return NULL;
return buf;
} }
void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no, void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,

4
gfx/d3d9/d3d_wrapper.h
View File

@ -22,9 +22,9 @@
void d3d_swap(void *data, LPDIRECT3DDEVICE dev); void d3d_swap(void *data, LPDIRECT3DDEVICE dev);
HRESULT d3d_create_vertex_buffer(LPDIRECT3DDEVICE dev, LPDIRECT3DVERTEXBUFFER d3d_vertex_buffer_new(LPDIRECT3DDEVICE dev,
unsigned length, unsigned usage, unsigned fvf, unsigned length, unsigned usage, unsigned fvf,
D3DPOOL pool, LPDIRECT3DVERTEXBUFFER vert_buf, void *handle); D3DPOOL pool, void *handle);
void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no, void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,
LPDIRECT3DVERTEXBUFFER stream_vertbuf, unsigned offset_bytes, LPDIRECT3DVERTEXBUFFER stream_vertbuf, unsigned offset_bytes,

12
gfx/d3d9/render_chain.cpp
View File

@ -156,13 +156,11 @@ bool renderchain_add_pass(void *data, const LinkInfo *info)
if (!renderchain_init_shader_fvf(chain, &pass)) if (!renderchain_init_shader_fvf(chain, &pass))
return false; return false;
if (FAILED(D3DDevice_CreateVertexBuffers(d3dr, 4 * sizeof(Vertex), pass.vertex_buf = (LPDIRECT3DVERTEXBUFFER)d3d_vertex_buffer_new(d3dr, 4 * sizeof(Vertex),
d3dr->GetSoftwareVertexProcessing() d3dr->GetSoftwareVertexProcessing() ? D3DUSAGE_SOFTWAREPROCESSING : 0,
? D3DUSAGE_SOFTWAREPROCESSING : 0, 0, D3DPOOL_DEFAULT, NULL);
0,
D3DPOOL_DEFAULT, if (!pass.vertex_buf)
&pass.vertex_buf,
NULL)))
return false; return false;
if (FAILED(d3dr->CreateTexture(info->tex_w, info->tex_h, 1, if (FAILED(d3dr->CreateTexture(info->tex_w, info->tex_h, 1,