libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-06 01:19:37 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Move font variable to d3d_w32_font.cpp

Browse Source
This commit is contained in:
twinaphex 2014-09-13 21:59:11 +02:00
parent 78492f238a
commit 397dd132b4
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/d3d9/d3d.cpp
View File

@ -685,9 +685,6 @@ static void *d3d_init(const video_info_t *info,
/* Default values */ /* Default values */
vid->g_pD3D = NULL; vid->g_pD3D = NULL;
vid->dev = NULL; vid->dev = NULL;
#ifndef _XBOX
vid->font = NULL;
#endif
vid->dev_rotation = 0; vid->dev_rotation = 0;
vid->needs_restore = false; vid->needs_restore = false;
#ifdef HAVE_CG #ifdef HAVE_CG

3
gfx/d3d9/d3d.hpp
View File

@ -115,9 +115,6 @@ typedef struct d3d_video
HWND hWnd; HWND hWnd;
LPDIRECT3D g_pD3D; LPDIRECT3D g_pD3D;
LPDIRECT3DDEVICE dev; LPDIRECT3DDEVICE dev;
#ifndef _XBOX
LPD3DXFONT font;
#endif
#if defined(HAVE_D3D9) && defined(_XBOX) #if defined(HAVE_D3D9) && defined(_XBOX)
LPDIRECT3DSURFACE lpSurface; LPDIRECT3DSURFACE lpSurface;
LPDIRECT3DTEXTURE lpTexture_ot_as16srgb; LPDIRECT3DTEXTURE lpTexture_ot_as16srgb;

16
gfx/fonts/d3d_w32_font.cpp
View File

@ -19,6 +19,8 @@
#include "../gfx_common.h" #include "../gfx_common.h"
#include "../../general.h" #include "../../general.h"
static LPD3DXFONT d3d_font;
static bool d3dfonts_w32_init_font(void *data, static bool d3dfonts_w32_init_font(void *data,
const char *font_path, unsigned font_size) const char *font_path, unsigned font_size)
{ {
@ -39,15 +41,15 @@ static bool d3dfonts_w32_init_font(void *data,
uint32_t b = static_cast<uint32_t>(g_settings.video.msg_color_b * 255) & 0xff; uint32_t b = static_cast<uint32_t>(g_settings.video.msg_color_b * 255) & 0xff;
d3d->font_color = D3DCOLOR_XRGB(r, g, b); d3d->font_color = D3DCOLOR_XRGB(r, g, b);
return SUCCEEDED(D3DXCreateFontIndirect(d3d->dev, &desc, &d3d->font)); return SUCCEEDED(D3DXCreateFontIndirect(d3d->dev, &desc, &d3d_font));
} }
static void d3dfonts_w32_deinit_font(void *data) static void d3dfonts_w32_deinit_font(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; (void)data;
if (d3d->font) if (d3d_font)
d3d->font->Release(); d3d_font->Release();
d3d->font = NULL; d3d_font = NULL;
} }
static void d3dfonts_w32_render_msg(void *data, const char *msg, static void d3dfonts_w32_render_msg(void *data, const char *msg,
@ -57,14 +59,14 @@ static void d3dfonts_w32_render_msg(void *data, const char *msg,
if (msg && SUCCEEDED(d3d->dev->BeginScene())) if (msg && SUCCEEDED(d3d->dev->BeginScene()))
{ {
d3d->font->DrawTextA(NULL, d3d_font->DrawTextA(NULL,
msg, msg,
-1, -1,
&d3d->font_rect_shifted, &d3d->font_rect_shifted,
DT_LEFT, DT_LEFT,
((d3d->font_color >> 2) & 0x3f3f3f) | 0xff000000); ((d3d->font_color >> 2) & 0x3f3f3f) | 0xff000000);
d3d->font->DrawTextA(NULL, d3d_font->DrawTextA(NULL,
msg, msg,
-1, -1,
&d3d->font_rect, &d3d->font_rect,