mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add real_width and real_height to video_info struct - let"

Browse Source 
This reverts commit 831ea1a5076365b2ef31484061a1ea2142f28d2f.
This commit is contained in:
twinaphex 2017-04-24 12:25:07 +02:00
parent 023599366c
commit e5b38315fe
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/drivers/caca_gfx.c
View File

@ -47,11 +47,11 @@ static void caca_gfx_free(void *data);
static void caca_gfx_create(void) static void caca_gfx_create(void)
{ {
caca_display = caca_create_display(NULL); caca_display = caca_create_display(NULL);
caca_cv = caca_get_canvas(caca_display); caca_cv = caca_get_canvas(caca_display);
if(!caca_video_width || !caca_video_height) if(!caca_video_width || !caca_video_height)
{ {
caca_video_width = caca_get_canvas_width(caca_cv); caca_video_width = caca_get_canvas_width(caca_cv);
caca_video_height = caca_get_canvas_height(caca_cv); caca_video_height = caca_get_canvas_height(caca_cv);
} }
@ -61,6 +61,8 @@ static void caca_gfx_create(void)
else else
caca_dither = caca_create_dither(16, caca_video_width, caca_video_height, caca_video_pitch, caca_dither = caca_create_dither(16, caca_video_width, caca_video_height, caca_video_pitch,
0xf800, 0x7e0, 0x1f, 0x0); 0xf800, 0x7e0, 0x1f, 0x0);
video_driver_set_size(&caca_video_width, &caca_video_height);
} }
static void *caca_gfx_init(video_info_t *video, static void *caca_gfx_init(video_info_t *video,
@ -86,9 +88,6 @@ static void *caca_gfx_init(video_info_t *video,
caca_gfx_create(); caca_gfx_create();
video->real_width = caca_video_width;
video->real_height = caca_video_height;
if (!caca_cv || !caca_dither || !caca_display) if (!caca_cv || !caca_dither || !caca_display)
{ {
/* TODO: handle errors */ /* TODO: handle errors */

4
gfx/drivers/ctr_gfx.c
View File

@ -305,9 +305,7 @@ static void* ctr_init(video_info_t* video,
ctr->vp.height = CTR_TOP_FRAMEBUFFER_HEIGHT; ctr->vp.height = CTR_TOP_FRAMEBUFFER_HEIGHT;
ctr->vp.full_width = CTR_TOP_FRAMEBUFFER_WIDTH; ctr->vp.full_width = CTR_TOP_FRAMEBUFFER_WIDTH;
ctr->vp.full_height = CTR_TOP_FRAMEBUFFER_HEIGHT; ctr->vp.full_height = CTR_TOP_FRAMEBUFFER_HEIGHT;
video_driver_set_size(&ctr->vp.width, &ctr->vp.height);
video->real_width = ctr->vp.width;
video->real_height = ctr->vp.height;
ctr->drawbuffers.top.left = vramAlloc(CTR_TOP_FRAMEBUFFER_WIDTH * CTR_TOP_FRAMEBUFFER_HEIGHT * 2 * sizeof(uint32_t)); ctr->drawbuffers.top.left = vramAlloc(CTR_TOP_FRAMEBUFFER_WIDTH * CTR_TOP_FRAMEBUFFER_HEIGHT * 2 * sizeof(uint32_t));
ctr->drawbuffers.top.right = (void*)((uint32_t*)ctr->drawbuffers.top.left + CTR_TOP_FRAMEBUFFER_WIDTH * CTR_TOP_FRAMEBUFFER_HEIGHT); ctr->drawbuffers.top.right = (void*)((uint32_t*)ctr->drawbuffers.top.left + CTR_TOP_FRAMEBUFFER_WIDTH * CTR_TOP_FRAMEBUFFER_HEIGHT);

25
gfx/drivers/gdi_gfx.c
View File

@ -115,18 +115,27 @@ static void *gdi_gfx_init(video_info_t *video,
if (!video_context_driver_set_video_mode(&mode)) if (!video_context_driver_set_video_mode(&mode))
goto error; goto error;
mode.width = 0; mode.width = 0;
mode.height = 0; mode.height = 0;
video_context_driver_get_video_size(&mode); video_context_driver_get_video_size(&mode);
video->real_width = mode.width; temp_width = mode.width;
video->real_height = mode.height; temp_height = mode.height;
mode.width = 0; mode.width = 0;
mode.height = 0; mode.height = 0;
inp.input = input; /* Get real known video size, which might have been altered by context. */
inp.input_data = input_data;
if (temp_width != 0 && temp_height != 0)
video_driver_set_size(&temp_width, &temp_height);
video_driver_get_size(&temp_width, &temp_height);
RARCH_LOG("[GDI]: Using resolution %ux%u\n", temp_width, temp_height);
inp.input = input;
inp.input_data = input_data;
video_context_driver_input_driver(&inp); video_context_driver_input_driver(&inp);

9
gfx/drivers/gl.c
View File

@ -1913,11 +1913,10 @@ static void *gl_init(video_info_t *video, const input_driver_t **input, void **i
video_context_driver_get_video_size(&mode); video_context_driver_get_video_size(&mode);
if (mode.width != 0 && mode.height != 0) video->real_width = mode.width;
{ video->real_height = mode.height;
video->real_width = mode.width; mode.width = 0;
video->real_height = mode.height; mode.height = 0;
}
hwr = video_driver_get_hw_context(); hwr = video_driver_get_hw_context();

4
gfx/drivers/vita2d_gfx.c
View File

@ -91,9 +91,7 @@ static void *vita2d_gfx_init(video_info_t *video,
vita->tex_filter = video->smooth vita->tex_filter = video->smooth
? SCE_GXM_TEXTURE_FILTER_LINEAR : SCE_GXM_TEXTURE_FILTER_POINT; ? SCE_GXM_TEXTURE_FILTER_LINEAR : SCE_GXM_TEXTURE_FILTER_POINT;
video->real_width = temp_width; video_driver_set_size(&temp_width, &temp_height);
video->real_height = temp_height;
vita2d_gfx_set_viewport(vita, temp_width, temp_height, false, true); vita2d_gfx_set_viewport(vita, temp_width, temp_height, false, true);

13
gfx/drivers/vulkan.c
View File

@ -1129,15 +1129,14 @@ static void *vulkan_init(video_info_t *video,
} }
video_context_driver_get_video_size(&mode); video_context_driver_get_video_size(&mode);
temp_width = mode.width;
temp_height = mode.height;
temp_width = mode.width; if (temp_width != 0 && temp_height != 0)
temp_height = mode.height; video_driver_set_size(&temp_width, &temp_height);
video_driver_get_size(&temp_width, &temp_height);
if (mode.width != 0 && mode.height != 0) RARCH_LOG("[Vulkan]: Using resolution %ux%u\n", temp_width, temp_height);
{
video->real_width = temp_width;
video->real_height = temp_height;
}
video_context_driver_get_context_data(&vk->context); video_context_driver_get_context_data(&vk->context);

4
gfx/drivers/wiiu_gfx.c
View File

@ -502,9 +502,7 @@ static void* wiiu_gfx_init(video_info_t* video,
wiiu->vp.height = wiiu->render_mode.height; wiiu->vp.height = wiiu->render_mode.height;
wiiu->vp.full_width = wiiu->render_mode.width; wiiu->vp.full_width = wiiu->render_mode.width;
wiiu->vp.full_height = wiiu->render_mode.height; wiiu->vp.full_height = wiiu->render_mode.height;
video_driver_set_size(&wiiu->vp.width, &wiiu->vp.height);
video->real_width = wiiu->vp.width;
video->real_height = wiiu->vp.height;
driver_ctl(RARCH_DRIVER_CTL_SET_REFRESH_RATE, &refresh_rate); driver_ctl(RARCH_DRIVER_CTL_SET_REFRESH_RATE, &refresh_rate);