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

(XDK D3D) Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-03-06 04:58:21 +01:00
parent a99bea53d9
commit 36c160b909
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
xdk/xdk_d3d.cpp
View File

@ -247,11 +247,11 @@ static void xdk_d3d_set_rotation(void *data, unsigned rot)
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
d3d->dev_rotation = rot; d3d->dev_rotation = rot;
#if defined(HAVE_HLSL) #if defined(_XBOX360) && defined(HAVE_HLSL)
/* TODO: Move to D3DXMATRIX here */
hlsl_set_proj_matrix(XMMatrixRotationZ(d3d->dev_rotation * (M_PI / 2.0))); hlsl_set_proj_matrix(XMMatrixRotationZ(d3d->dev_rotation * (M_PI / 2.0)));
#elif defined(_XBOX1) #elif defined(_XBOX1)
D3DXMATRIX p_out, p_rotate; D3DXMATRIX p_out, p_rotate, mat;
D3DXMatrixOrthoOffCenterLH(&mat, 0, d3d->screen_width , d3d->screen_height , 0, 0.0f, 1.0f);
D3DXMatrixIdentity(&p_out); D3DXMatrixIdentity(&p_out);
D3DXMatrixRotationZ(&p_rotate, d3d->dev_rotation * (M_PI / 2.0)); D3DXMatrixRotationZ(&p_rotate, d3d->dev_rotation * (M_PI / 2.0));
@ -434,27 +434,19 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
xdk_d3d_init_textures(d3d, video); xdk_d3d_init_textures(d3d, video);
#if defined(_XBOX1)
// use an orthogonal matrix for the projection matrix
D3DXMATRIX mat;
D3DXMatrixOrthoOffCenterLH(&mat, 0, d3d->screen_width , d3d->screen_height , 0, 0.0f, 1.0f);
d3d->dev->SetTransform(D3DTS_PROJECTION, &mat);
// use an identity matrix for the world and view matrices
D3DXMatrixIdentity(&mat);
d3d->dev->SetTransform(D3DTS_WORLD, &mat);
d3d->dev->SetTransform(D3DTS_VIEW, &mat);
ret = d3d->dev->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats), ret = d3d->dev->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats),
D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, &d3d->vertex_buf); D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, &d3d->vertex_buf
#ifdef _XBOX360
,NULL
#endif
);
if (ret != S_OK) if (ret != S_OK)
{ {
RARCH_ERR("[xdk_d3d_init::] Failed at CreateVertexBuffer.\n"); RARCH_ERR("[xdk_d3d_init::] Failed at CreateVertexBuffer.\n");
return NULL; return NULL;
} }
#if defined(_XBOX1)
const DrawVerticeFormats init_verts[] = { const DrawVerticeFormats init_verts[] = {
{ -1.0f, -1.0f, 1.0f, 0.0f, 1.0f }, { -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, 1.0f, 1.0f },
@ -469,15 +461,6 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
RD3DDevice_SetVertexShader(d3d->d3d_render_device, D3DFVF_XYZ | D3DFVF_TEX1); RD3DDevice_SetVertexShader(d3d->d3d_render_device, D3DFVF_XYZ | D3DFVF_TEX1);
#elif defined(_XBOX360) #elif defined(_XBOX360)
ret = d3d->dev->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats),
0, 0, 0, &d3d->vertex_buf, NULL);
if (ret != S_OK)
{
RARCH_ERR("[xdk_d3d_init::] Failed at CreateVertexBuffer.\n");
return NULL;
}
static const DrawVerticeFormats init_verts[] = { static const DrawVerticeFormats init_verts[] = {
{ -1.0f, -1.0f, 0.0f, 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 },

4
xdk/xdk_d3d.h
View File

@ -30,7 +30,11 @@
#include "../xdk/xdk_defines.h" #include "../xdk/xdk_defines.h"
#define DFONT_MAX 4096 #define DFONT_MAX 4096
#if defined(_XBOX360)
#define D3DFVF_CUSTOMVERTEX 0
#elif defined(_XBOX1)
#define D3DFVF_CUSTOMVERTEX (D3DFVF_XYZRHW | D3DFVF_TEX1) #define D3DFVF_CUSTOMVERTEX (D3DFVF_XYZRHW | D3DFVF_TEX1)
#endif
typedef struct DrawVerticeFormats typedef struct DrawVerticeFormats
{ {