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

Some C89_BUILD build fixes

Browse Source
This commit is contained in:
twinaphex 2018-02-03 12:47:53 +01:00
parent ef75c80218
commit d446742d4b
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/drivers/d3d10.c
View File

@ -510,8 +510,10 @@ static void d3d10_gfx_apply_state_changes(void* data)
{ {
d3d10_video_t* d3d10 = (d3d10_video_t*)data; d3d10_video_t* d3d10 = (d3d10_video_t*)data;
// if (d3d10) #if 0
// d3d10->resize_viewport = true; if (d3d10)
d3d10->resize_viewport = true;
#endif
} }
static const video_poke_interface_t d3d10_poke_interface = { static const video_poke_interface_t d3d10_poke_interface = {

34
gfx/drivers_font/d3d_w32_font.c
View File

@ -16,6 +16,8 @@
#include <tchar.h> #include <tchar.h>
#include <compat/strl.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../../config.h" #include "../../config.h"
#endif #endif
@ -54,22 +56,25 @@ static void *d3dfonts_w32_init_font(void *video_data,
bool is_threaded) bool is_threaded)
{ {
TEXTMETRICA metrics; TEXTMETRICA metrics;
settings_t *settings = config_get_ptr(); d3dx_font_desc_t desc;
d3dx_font_desc_t desc = {
(int)(font_size), 0, 400, 0,
false, DEFAULT_CHARSET,
OUT_TT_PRECIS,
CLIP_DEFAULT_PRECIS,
DEFAULT_PITCH,
#ifdef UNICODE
_T(L"Verdana")
#else
_T("Verdana")
#endif
};
d3dfonts_t *d3dfonts = (d3dfonts_t*)calloc(1, sizeof(*d3dfonts)); d3dfonts_t *d3dfonts = (d3dfonts_t*)calloc(1, sizeof(*d3dfonts));
if (!d3dfonts) if (!d3dfonts)
return NULL; return NULL;
desc.Height = (int)font_size;
desc.Width = 0;
desc.Weight = 400;
desc.MipLevels = 0;
desc.Italic = FALSE;
desc.CharSet = DEFAULT_CHARSET;
desc.OutputPrecision = OUT_TT_PRECIS;
desc.Quality = CLIP_DEFAULT_PRECIS;
desc.PitchAndFamily = DEFAULT_PITCH;
#ifdef UNICODE
strlcpy(desc.FaceName, T(L"Verdana"), sizeof(desc.FaceName));
#else
strlcpy(desc.FaceName, _T("Verdana"), sizeof(desc.FaceName));
#endif
d3dfonts->font_size = font_size * 1.2; /* to match the other font drivers */ d3dfonts->font_size = font_size * 1.2; /* to match the other font drivers */
d3dfonts->d3d = (d3d_video_t*)video_data; d3dfonts->d3d = (d3d_video_t*)video_data;
@ -130,7 +135,6 @@ static void d3dfonts_w32_render_msg(video_frame_info_t *video_info,
RECT rect, rect_shifted; RECT rect, rect_shifted;
RECT *p_rect_shifted = NULL; RECT *p_rect_shifted = NULL;
RECT *p_rect = NULL; RECT *p_rect = NULL;
settings_t *settings = config_get_ptr();
const struct font_params *params = (const struct font_params*)userdata; const struct font_params *params = (const struct font_params*)userdata;
d3dfonts_t *d3dfonts = (d3dfonts_t*)data; d3dfonts_t *d3dfonts = (d3dfonts_t*)data;
unsigned width = video_info->width; unsigned width = video_info->width;

2
gfx/video_driver.h
View File

@ -101,7 +101,7 @@ enum gfx_ctx_api
GFX_CTX_OPENVG_API, GFX_CTX_OPENVG_API,
GFX_CTX_VULKAN_API, GFX_CTX_VULKAN_API,
GFX_CTX_GDI_API, GFX_CTX_GDI_API,
GFX_CTX_GX2_API, GFX_CTX_GX2_API
}; };
enum display_metric_types enum display_metric_types

4
menu/cbs/menu_cbs_get_value.c
View File

@ -1820,7 +1820,7 @@ static void menu_action_setting_disp_set_label_netplay_share_analog(file_list_t*
} }
strlcpy(s, src, len); strlcpy(s, src, len);
} }
#endif // HAVE_NETWORKING #endif
static int menu_cbs_init_bind_get_string_representation_compare_label( static int menu_cbs_init_bind_get_string_representation_compare_label(
menu_file_list_cbs_t *cbs) menu_file_list_cbs_t *cbs)
@ -1938,7 +1938,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
BIND_ACTION_GET_VALUE(cbs, BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_netplay_share_analog); menu_action_setting_disp_set_label_netplay_share_analog);
break; break;
#endif // HAVE_NETWORKING #endif
case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST: case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST:
case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY: case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY:
case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST: