diff --git a/gfx/common/vita2d_common.h b/gfx/common/vita2d_common.h index eb3efbd398..ec7ce195b5 100644 --- a/gfx/common/vita2d_common.h +++ b/gfx/common/vita2d_common.h @@ -84,6 +84,9 @@ typedef struct vita_video bool overlay_full_screen; #endif + unsigned width; + unsigned height; + } vita_video_t; #endif diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 92df09d4e7..031eadafea 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -92,6 +92,9 @@ static void *vita2d_gfx_init(const video_info_t *video, vita->tex_filter = video->smooth ? SCE_GXM_TEXTURE_FILTER_LINEAR : SCE_GXM_TEXTURE_FILTER_POINT; + vita->width = temp_width; + vita->height = temp_height; + video_driver_set_size(temp_width, temp_height); vita2d_gfx_set_viewport(vita, temp_width, temp_height, false, true); diff --git a/gfx/drivers_font/ctr_font.c b/gfx/drivers_font/ctr_font.c index c7f850c0ab..08d9529cfe 100644 --- a/gfx/drivers_font/ctr_font.c +++ b/gfx/drivers_font/ctr_font.c @@ -368,8 +368,8 @@ static void ctr_font_render_msg( alpha, r_dark, g_dark, b_dark, alpha_dark; ctr_font_t * font = (ctr_font_t*)data; ctr_video_t *ctr = (ctr_video_t*)userdata; - unsigned width = video_info->width; - unsigned height = video_info->height; + unsigned width = ctr->vp.width; + unsigned height = ctr->vp.height; settings_t *settings = config_get_ptr(); float video_msg_pos_x = settings->floats.video_msg_pos_x; float video_msg_pos_y = settings->floats.video_msg_pos_y; diff --git a/gfx/drivers_font/d3d10_font.c b/gfx/drivers_font/d3d10_font.c index 401ae4dec4..d35df9a647 100644 --- a/gfx/drivers_font/d3d10_font.c +++ b/gfx/drivers_font/d3d10_font.c @@ -294,8 +294,8 @@ static void d3d10_font_render_msg( alpha, r_dark, g_dark, b_dark, alpha_dark; d3d10_font_t* font = (d3d10_font_t*)data; d3d10_video_t* d3d10 = (d3d10_video_t*)userdata; - unsigned width = video_info->width; - unsigned height = video_info->height; + unsigned width = d3d10->vp.full_width; + unsigned height = d3d10->vp.full_height; settings_t *settings = config_get_ptr(); float video_msg_pos_x = settings->floats.video_msg_pos_x; float video_msg_pos_y = settings->floats.video_msg_pos_y; diff --git a/gfx/drivers_font/d3d11_font.c b/gfx/drivers_font/d3d11_font.c index e213bf4f53..9cb189b3d9 100644 --- a/gfx/drivers_font/d3d11_font.c +++ b/gfx/drivers_font/d3d11_font.c @@ -290,8 +290,8 @@ static void d3d11_font_render_msg( alpha, r_dark, g_dark, b_dark, alpha_dark; d3d11_font_t* font = (d3d11_font_t*)data; d3d11_video_t * d3d11 = (d3d11_video_t*)userdata; - unsigned width = video_info->width; - unsigned height = video_info->height; + unsigned width = d3d11->vp.full_width; + unsigned height = d3d11->vp.full_height; settings_t *settings = config_get_ptr(); float video_msg_pos_x = settings->floats.video_msg_pos_x; float video_msg_pos_y = settings->floats.video_msg_pos_y; diff --git a/gfx/drivers_font/d3d12_font.c b/gfx/drivers_font/d3d12_font.c index 931e98292f..0627660791 100644 --- a/gfx/drivers_font/d3d12_font.c +++ b/gfx/drivers_font/d3d12_font.c @@ -303,8 +303,8 @@ static void d3d12_font_render_msg( alpha, r_dark, g_dark, b_dark, alpha_dark; d3d12_video_t *d3d12 = (d3d12_video_t*)userdata; d3d12_font_t* font = (d3d12_font_t*)data; - unsigned width = video_info->width; - unsigned height = video_info->height; + unsigned width = d3d12->vp.full_width; + unsigned height = d3d12->vp.full_height; settings_t *settings = config_get_ptr(); float video_msg_pos_x = settings->floats.video_msg_pos_x; float video_msg_pos_y = settings->floats.video_msg_pos_y; diff --git a/gfx/drivers_font/d3d_w32_font.c b/gfx/drivers_font/d3d_w32_font.c index 0077436d48..00d1153033 100644 --- a/gfx/drivers_font/d3d_w32_font.c +++ b/gfx/drivers_font/d3d_w32_font.c @@ -133,12 +133,11 @@ static void d3dfonts_w32_render_msg( { unsigned format; unsigned a, r, g, b; + unsigned width, height; RECT rect, rect_shifted; RECT *p_rect_shifted = NULL; RECT *p_rect = NULL; d3dfonts_t *d3dfonts = (d3dfonts_t*)data; - unsigned width = video_info->width; - unsigned height = video_info->height; float drop_mod = 0.3f; float drop_alpha = 1.0f; int drop_x = -2; @@ -150,12 +149,15 @@ static void d3dfonts_w32_render_msg( float video_msg_color_g = settings->floats.video_msg_color_g; float video_msg_color_b = settings->floats.video_msg_color_b; - if (!d3dfonts || !d3dfonts->d3d || !msg) + if (!d3dfonts || !msg) return; - format = DT_LEFT; - p_rect = &d3dfonts->d3d->font_rect; - p_rect_shifted = &d3dfonts->d3d->font_rect_shifted; + width = d3dfonts->d3d->video_info.width; + height = d3dfonts->d3d->video_info.height; + + p_rect = &d3dfonts->d3d->font_rect; + p_rect_shifted = &d3dfonts->d3d->font_rect_shifted; + format = DT_LEFT; if(params) { diff --git a/gfx/drivers_font/fpga_font.c b/gfx/drivers_font/fpga_font.c index a55c743751..d89757b507 100644 --- a/gfx/drivers_font/fpga_font.c +++ b/gfx/drivers_font/fpga_font.c @@ -82,13 +82,13 @@ static void fpga_render_msg( void *userdata, video_frame_info_t *video_info, void *data, const char *msg, - const void *userdata) + const void *_params) { float x, y, scale; unsigned newX, newY, len; unsigned align; fpga_raster_t *font = (fpga_raster_t*)data; - const struct font_params *params = (const struct font_params*)userdata; + const struct font_params *params = (const struct font_params*)_params; unsigned width = video_info->width; unsigned height = video_info->height; settings_t *settings = config_get_ptr(); diff --git a/gfx/drivers_font/vita2d_font.c b/gfx/drivers_font/vita2d_font.c index 4ee0038a2a..c1b864117d 100644 --- a/gfx/drivers_font/vita2d_font.c +++ b/gfx/drivers_font/vita2d_font.c @@ -273,9 +273,10 @@ static void vita2d_font_render_msg( bool full_screen = false ; unsigned color, color_dark, r, g, b, alpha, r_dark, g_dark, b_dark, alpha_dark; + vita_video_t *vita = (vita_video_t *)userdata; vita_font_t *font = (vita_font_t *)data; - unsigned width = video_info->width; - unsigned height = video_info->height; + unsigned width = vita->width; + unsigned height = vita->height; settings_t *settings = config_get_ptr(); float video_msg_pos_x = settings->floats.video_msg_pos_x; float video_msg_pos_y = settings->floats.video_msg_pos_y; diff --git a/gfx/drivers_font/wiiu_font.c b/gfx/drivers_font/wiiu_font.c index d9227f5bb7..6a65c5670f 100644 --- a/gfx/drivers_font/wiiu_font.c +++ b/gfx/drivers_font/wiiu_font.c @@ -297,8 +297,8 @@ static void wiiu_font_render_msg( alpha, r_dark, g_dark, b_dark, alpha_dark; wiiu_video_t *wiiu = (wiiu_video_t*)userdata; wiiu_font_t *font = (wiiu_font_t*)data; - unsigned width = video_info->width; - unsigned height = video_info->height; + unsigned width = wiiu->vp.width; + unsigned height = wiiu->vp.height; settings_t *settings = config_get_ptr(); float video_msg_pos_x = settings->floats.video_msg_pos_x; float video_msg_pos_y = settings->floats.video_msg_pos_y;