ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(360/Xbox 1) Some more work on xdk_d3d.cpp

This commit is contained in:
twinaphex 2012-07-07 22:47:23 +03:00
parent 80afd6a73f
commit 1c5861650b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
360/xdk_d3d.cpp
View File

@ -304,7 +304,11 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
d3d->last_height = 512; d3d->last_height = 512;
d3d->d3d_render_device->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats), d3d->d3d_render_device->CreateVertexBuffer(4 * sizeof(DrawVerticeFormats),
0, 0, 0, &d3d->vertex_buf, NULL); 0, 0, 0, &d3d->vertex_buf
#ifdef _XBOX360
, NULL
#endif
);
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 },
@ -313,7 +317,11 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
{ 1.0f, 1.0f, 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f, 0.0f },
}; };
#ifdef _XBOX1
BYTE *verts_ptr;
#else
void *verts_ptr; void *verts_ptr;
#endif
d3d->vertex_buf->Lock(0, 0, &verts_ptr, 0); d3d->vertex_buf->Lock(0, 0, &verts_ptr, 0);
memcpy(verts_ptr, init_verts, sizeof(init_verts)); memcpy(verts_ptr, init_verts, sizeof(init_verts));
d3d->vertex_buf->Unlock(); d3d->vertex_buf->Unlock();
@ -370,7 +378,9 @@ static bool xdk_d3d_frame(void *data, const void *frame,
return true; return true;
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
#ifdef HAVE_FBO
D3DSurface* pRenderTarget0; D3DSurface* pRenderTarget0;
#endif
bool menu_enabled = g_console.menu_enable; bool menu_enabled = g_console.menu_enable;
if (d3d->last_width != width || d3d->last_height != height) if (d3d->last_width != width || d3d->last_height != height)
@ -398,7 +408,11 @@ static bool xdk_d3d_frame(void *data, const void *frame,
verts[i].y += 0.5f / 512.0f; verts[i].y += 0.5f / 512.0f;
} }
#ifdef _XBOX1
BYTE *verts_ptr;
#else
void *verts_ptr; void *verts_ptr;
#endif
d3d->vertex_buf->Lock(0, 0, &verts_ptr, 0); d3d->vertex_buf->Lock(0, 0, &verts_ptr, 0);
memcpy(verts_ptr, verts, sizeof(verts)); memcpy(verts_ptr, verts, sizeof(verts));
d3d->vertex_buf->Unlock(); d3d->vertex_buf->Unlock();
@ -407,11 +421,13 @@ static bool xdk_d3d_frame(void *data, const void *frame,
d3d->last_height = height; d3d->last_height = height;
} }
#ifdef HAVE_FBO
if (d3d->fbo_enabled) if (d3d->fbo_enabled)
{ {
d3d->d3d_render_device->GetRenderTarget(0, &pRenderTarget0); d3d->d3d_render_device->GetRenderTarget(0, &pRenderTarget0);
d3d->d3d_render_device->SetRenderTarget(0, d3d->lpSurface); d3d->d3d_render_device->SetRenderTarget(0, d3d->lpSurface);
} }
#endif
if (d3d->should_resize) if (d3d->should_resize)
xdk_d3d_set_viewport(false); xdk_d3d_set_viewport(false);

1
360/xdk_d3d.h
View File

@ -55,6 +55,7 @@ typedef struct DrawVerticeFormats
#define IDirect3DVertexBuffer IDirect3DVertexBuffer8 #define IDirect3DVertexBuffer IDirect3DVertexBuffer8
#define SetSamplerState SetTextureStageState #define SetSamplerState SetTextureStageState
#define D3DLOCK_NOSYSLOCK (0)
#define D3DSAMP_ADDRESSU D3DTSS_ADDRESSU #define D3DSAMP_ADDRESSU D3DTSS_ADDRESSU
#define D3DSAMP_ADDRESSV D3DTSS_ADDRESSV #define D3DSAMP_ADDRESSV D3DTSS_ADDRESSV