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

(XDK1) Build fixes

Browse Source
This commit is contained in:
twinaphex 2015-04-12 22:29:30 +02:00
parent 9a3ba16a36
commit f4bd33b92f
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/d3d/d3d.cpp
View File

@ -1044,10 +1044,14 @@ extern struct texture_image *menu_texture;
#endif #endif
#ifdef _XBOX1 #ifdef _XBOX1
#include <formats/image.h>
static bool texture_image_render(d3d_video_t *d3d, static bool texture_image_render(d3d_video_t *d3d,
struct texture_image *out_img, struct texture_image *out_img,
int x, int y, int w, int h, bool force_fullscreen) int x, int y, int w, int h, bool force_fullscreen)
{ {
LPDIRECT3DTEXTURE d3dt;
LPDIRECT3DVERTEXBUFFER d3dv;
void *verts = NULL; void *verts = NULL;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
float fX = (float)(x); float fX = (float)(x);
@ -1055,7 +1059,11 @@ static bool texture_image_render(d3d_video_t *d3d,
if (!d3d) if (!d3d)
return false; return false;
if (!out_img->pixels || !out_img->vertex_buf)
d3dt = (LPDIRECT3DTEXTURE)out_img->texture_buf;
d3dv = (LPDIRECT3DVERTEXBUFFER)out_img->vertex_buf;
if (!d3dt || !d3dv)
return false; return false;
/* Create the new vertices. */ /* Create the new vertices. */
@ -1069,22 +1077,22 @@ static bool texture_image_render(d3d_video_t *d3d,
}; };
/* Load the existing vertices */ /* Load the existing vertices */
verts = d3d_vertex_buffer_lock(out_img->vertex_buf); verts = d3d_vertex_buffer_lock(d3dv);
if (!verts) if (!verts)
return false; return false;
/* Copy the new verts over the old verts */ /* Copy the new verts over the old verts */
memcpy(verts, newVerts, sizeof(newVerts)); memcpy(verts, newVerts, sizeof(newVerts));
d3d_vertex_buffer_unlock(out_img->vertex_buf); d3d_vertex_buffer_unlock(d3dv);
d3d_enable_blend_func(d3d->dev); d3d_enable_blend_func(d3d->dev);
d3d_enable_alpha_blend_texture_func(d3d->dev); d3d_enable_alpha_blend_texture_func(d3d->dev);
/* Draw the quad. */ /* Draw the quad. */
d3d_set_texture(d3dr, 0, out_img->texture_buf); d3d_set_texture(d3dr, 0, d3dt);
d3d_set_stream_source(d3dr, 0, d3d_set_stream_source(d3dr, 0,
out_img->vertex_buf, 0, sizeof(Vertex)); d3dv, 0, sizeof(Vertex));
d3d_set_vertex_shader(d3dr, D3DFVF_CUSTOMVERTEX, NULL); d3d_set_vertex_shader(d3dr, D3DFVF_CUSTOMVERTEX, NULL);
if (force_fullscreen) if (force_fullscreen)

8
gfx/image/image.c
View File

@ -144,12 +144,16 @@ static bool rpng_gx_convert_texture32(struct texture_image *image)
void texture_image_free(struct texture_image *img) void texture_image_free(struct texture_image *img)
{ {
#ifdef _XBOX1
LPDIRECT3DTEXTURE d3dt = (LPDIRECT3DTEXTURE)img->texture_buf;
LPDIRECT3DVERTEXBUFFER d3dv = (LPDIRECT3DVERTEXBUFFER)img->vertex_buf;
#endif
if (!img) if (!img)
return; return;
#ifdef _XBOX1 #ifdef _XBOX1
d3d_vertex_buffer_free(img->vertex_buf, NULL); d3d_vertex_buffer_free(d3dv, NULL);
d3d_texture_free(img->texture_buf); d3d_texture_free(d3dt);
#endif #endif
if (img->pixels) if (img->pixels)
free(img->pixels); free(img->pixels);

4
libretro-common/include/formats/image.h
View File

@ -35,8 +35,8 @@ struct texture_image
#ifdef _XBOX1 #ifdef _XBOX1
unsigned x; unsigned x;
unsigned y; unsigned y;
LPDIRECT3DTEXTURE texture_buf; void *texture_buf;
LPDIRECT3DVERTEXBUFFER vertex_buf; void *vertex_buf;
#endif #endif
uint32_t *pixels; uint32_t *pixels;
}; };