mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-15 23:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-10-20 05:00:20 +02:00
parent e71f8baa5f
commit 2cb7cc01bf
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/common/d3d_common.cpp
View File

@ -141,8 +141,9 @@ LPDIRECT3DVERTEXBUFFER d3d_vertex_buffer_new(LPDIRECT3DDEVICE dev,
return buf; return buf;
} }
void d3d_vertex_buffer_unlock(LPDIRECT3DVERTEXBUFFER vertbuf) void d3d_vertex_buffer_unlock(void *vertbuf_ptr)
{ {
LPDIRECT3DVERTEXBUFFER vertbuf = (LPDIRECT3DVERTEXBUFFER)vertbuf_ptr;
/* This is a stub on Xbox 1, see docs. */ /* This is a stub on Xbox 1, see docs. */
#ifndef _XBOX1 #ifndef _XBOX1
@ -159,9 +160,10 @@ void d3d_vertex_buffer_unlock(LPDIRECT3DVERTEXBUFFER vertbuf)
#endif #endif
} }
void *d3d_vertex_buffer_lock(LPDIRECT3DVERTEXBUFFER vertbuf) void *d3d_vertex_buffer_lock(void *vertbuf_ptr)
{ {
void *buf; void *buf;
LPDIRECT3DVERTEXBUFFER vertbuf = (LPDIRECT3DVERTEXBUFFER)vertbuf_ptr;
#if defined(_XBOX1) #if defined(_XBOX1)
buf = (void*)D3DVertexBuffer_Lock2(vertbuf, 0); buf = (void*)D3DVertexBuffer_Lock2(vertbuf, 0);
@ -197,9 +199,10 @@ void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration)
} }
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, void *stream_vertbuf_ptr, unsigned offset_bytes,
unsigned stride) unsigned stride)
{ {
LPDIRECT3DVERTEXBUFFER stream_vertbuf = (LPDIRECT3DVERTEXBUFFER)stream_vertbuf_ptr;
#if defined(HAVE_D3D8) #if defined(HAVE_D3D8)
IDirect3DDevice8_SetStreamSource(dev, stream_no, stream_vertbuf, stride); IDirect3DDevice8_SetStreamSource(dev, stream_no, stream_vertbuf, stride);
#elif defined(_XBOX360) #elif defined(_XBOX360)

6
gfx/common/d3d_common.h
View File

@ -30,8 +30,8 @@ LPDIRECT3DVERTEXBUFFER d3d_vertex_buffer_new(LPDIRECT3DDEVICE dev,
unsigned length, unsigned usage, unsigned fvf, unsigned length, unsigned usage, unsigned fvf,
D3DPOOL pool, void *handle); D3DPOOL pool, void *handle);
void *d3d_vertex_buffer_lock(LPDIRECT3DVERTEXBUFFER vertbuf); void *d3d_vertex_buffer_lock(void *data);
void d3d_vertex_buffer_unlock(LPDIRECT3DVERTEXBUFFER vertbuf); void d3d_vertex_buffer_unlock(void *data);
void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration); void d3d_vertex_buffer_free(void *vertex_data, void *vertex_declaration);
@ -43,7 +43,7 @@ LPDIRECT3DTEXTURE d3d_texture_new(LPDIRECT3DDEVICE dev,
PALETTEENTRY *palette); PALETTEENTRY *palette);
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, void *stream_vertbuf, unsigned offset_bytes,
unsigned stride); unsigned stride);
void d3d_texture_free(LPDIRECT3DTEXTURE tex); void d3d_texture_free(LPDIRECT3DTEXTURE tex);

2
gfx/drivers/d3d.cpp
View File

@ -403,7 +403,7 @@ static void d3d_overlay_render(d3d_video_t *d3d, overlay_t *overlay)
vert[i][1] += 0.5f; vert[i][1] += 0.5f;
} }
overlay->vert_buf->Lock(0, sizeof(vert), &verts, 0); verts = d3d_vertex_buffer_lock(overlay->vert_buf);
memcpy(verts, vert, sizeof(vert)); memcpy(verts, vert, sizeof(vert));
d3d_vertex_buffer_unlock(overlay->vert_buf); d3d_vertex_buffer_unlock(overlay->vert_buf);

4
gfx/drivers/d3d.h
View File

@ -67,9 +67,7 @@ typedef struct
bool enabled; bool enabled;
float alpha_mod; float alpha_mod;
LPDIRECT3DTEXTURE tex; LPDIRECT3DTEXTURE tex;
#ifdef HAVE_D3D9 void *vert_buf;
LPDIRECT3DVERTEXBUFFER vert_buf;
#endif
} overlay_t; } overlay_t;
#ifdef _XBOX #ifdef _XBOX