mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 04:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK360) Buildfixes

Browse Source
This commit is contained in:
twinaphex 2018-01-26 05:29:44 +01:00
parent 1f6b9e1c18
commit 16cccb8796
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers_font/xdk360_fonts.cpp
View File

@ -627,8 +627,9 @@ static void xdk360_draw_text(xdk360_video_font_t *font,
float x, float y, const wchar_t * strText) float x, float y, const wchar_t * strText)
{ {
uint32_t dwNumChars; uint32_t dwNumChars;
volatile float *pVertex;
float vColor[4], m_fCursorX, m_fCursorY; float vColor[4], m_fCursorX, m_fCursorY;
volatile float *pVertex = NULL;
LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)font->d3d->dev;
/* Set the color as a vertex shader constant. */ /* Set the color as a vertex shader constant. */
vColor[0] = ((0xffffffff & 0x00ff0000) >> 16L) / 255.0f; vColor[0] = ((0xffffffff & 0x00ff0000) >> 16L) / 255.0f;
@ -636,7 +637,7 @@ static void xdk360_draw_text(xdk360_video_font_t *font,
vColor[2] = ((0xffffffff & 0x000000ff) >> 0L) / 255.0f; vColor[2] = ((0xffffffff & 0x000000ff) >> 0L) / 255.0f;
vColor[3] = ((0xffffffff & 0xff000000) >> 24L) / 255.0f; vColor[3] = ((0xffffffff & 0xff000000) >> 24L) / 255.0f;
d3d_set_vertex_shader_constantf(font->d3d->dev, 1, vColor, 1); d3d_set_vertex_shader_constantf(dev, 1, vColor, 1);
m_fCursorX = floorf(x); m_fCursorX = floorf(x);
m_fCursorY = floorf(y); m_fCursorY = floorf(y);
@ -653,8 +654,13 @@ static void xdk360_draw_text(xdk360_video_font_t *font,
*/ */
dwNumChars = wcslen(strText); dwNumChars = wcslen(strText);
font->d3d->dev->BeginVertices(D3DPT_QUADLIST, 4 * dwNumChars, #ifdef __cplusplus
dev->BeginVertices(D3DPT_QUADLIST, 4 * dwNumChars,
sizeof(XMFLOAT4), (void**)&pVertex); sizeof(XMFLOAT4), (void**)&pVertex);
#else
D3DDevice_BeginVertices(dev, D3DPT_QUADLIST, 4 * dwNumChars,
sizeof(XMFLOAT4), (void**)&pVertex);
#endif
/* Draw four vertices for each glyph. */ /* Draw four vertices for each glyph. */
while (*strText) while (*strText)
@ -752,7 +758,11 @@ static void xdk360_draw_text(xdk360_video_font_t *font,
dwNumChars--; dwNumChars--;
} }
font->d3d->dev->EndVertices(); #ifdef __cplusplus
dev->EndVertices();
#else
D3DDevice_EndVertices(dev);
#endif
} }
static void xdk360_render_msg( static void xdk360_render_msg(