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

(XDK D3D) Cleanups - don't set vertex buffer immediately at

Browse Source 
init texture time - wait until set_vertices gets triggered
This commit is contained in:
twinaphex 2014-05-30 05:38:36 +02:00
parent c8f44ba94d
commit b38caa3cd3
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xdk/xdk_d3d.cpp
View File

@ -231,9 +231,6 @@ static void d3d_init_textures(void *data, const video_info_t *video)
D3DTexture_LockRect(d3d->tex, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK); D3DTexture_LockRect(d3d->tex, 0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
memset(d3dlr.pBits, 0, d3d->tex_w * d3dlr.Pitch); memset(d3dlr.pBits, 0, d3d->tex_w * d3dlr.Pitch);
d3d->last_width = d3d->tex_w;
d3d->last_height = d3d->tex_h;
#ifdef _XBOX1 #ifdef _XBOX1
d3d->dev->SetRenderState(D3DRS_LIGHTING, FALSE); d3d->dev->SetRenderState(D3DRS_LIGHTING, FALSE);
#endif #endif
@ -340,33 +337,8 @@ static bool d3d_init_chain(void *data, const video_info_t *info)
RARCH_ERR("[d3d_init::] Failed at CreateVertexBuffer.\n"); RARCH_ERR("[d3d_init::] Failed at CreateVertexBuffer.\n");
return false; return false;
} }
#if defined(_XBOX1)
const DrawVerticeFormats init_verts[] = {
{ -1.0f, -1.0f, 1.0f, 0.0f, 1.0f },
{ 1.0f, -1.0f, 1.0f, 1.0f, 1.0f },
{ -1.0f, 1.0f, 1.0f, 0.0f, 0.0f },
{ 1.0f, 1.0f, 1.0f, 1.0f, 0.0f },
};
BYTE *verts_ptr; #if defined(_XBOX360)
#elif defined(_XBOX360)
static const DrawVerticeFormats init_verts[] = {
{ -1.0f, -1.0f, 0.0f, 1.0f },
{ 1.0f, -1.0f, 1.0f, 1.0f },
{ -1.0f, 1.0f, 0.0f, 0.0f },
{ 1.0f, 1.0f, 1.0f, 0.0f },
};
void *verts_ptr;
#endif
d3d->vertex_buf->Lock(0, 0, &verts_ptr, 0);
memcpy(verts_ptr, init_verts, sizeof(init_verts));
d3d->vertex_buf->Unlock();
#if defined(_XBOX1)
d3d->dev->SetVertexShader(D3DFVF_XYZ | D3DFVF_TEX1);
#elif defined(_XBOX360)
static const D3DVERTEXELEMENT VertexElements[] = static const D3DVERTEXELEMENT VertexElements[] =
{ {
{ 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, { 0, 0 * sizeof(float), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 },
@ -644,6 +616,9 @@ static void set_vertices(void *data, unsigned pass, unsigned width, unsigned hei
if (d3d->last_width != width || d3d->last_height != height) if (d3d->last_width != width || d3d->last_height != height)
{ {
d3d->last_width = width;
d3d->last_height = height;
DrawVerticeFormats vert[4]; DrawVerticeFormats vert[4];
float tex_w = width; float tex_w = width;
float tex_h = height; float tex_h = height;
@ -708,9 +683,6 @@ static void set_vertices(void *data, unsigned pass, unsigned width, unsigned hei
RD3DVertexBuffer_Lock(d3d->vertex_buf, 0, 0, &verts, 0); RD3DVertexBuffer_Lock(d3d->vertex_buf, 0, 0, &verts, 0);
memcpy(verts, vert, sizeof(vert)); memcpy(verts, vert, sizeof(vert));
RD3DVertexBuffer_Unlock(d3d->vertex_buf); RD3DVertexBuffer_Unlock(d3d->vertex_buf);
d3d->last_width = width;
d3d->last_height = height;
} }
if (d3d->shader) if (d3d->shader)