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

Merge pull request #32 from alphanu1/alphanu1-patch-33

Browse Source 
Add files via upload
This commit is contained in:
alphanu1 2018-04-01 00:34:36 +01:00 committed by GitHub
commit 950719797d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 242 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

341
gfx/video_crt_switch.c
View File

@ -1,5 +1,5 @@
/* CRT SwitchRes Core /* CRT SwitchRes Core
* Copyright (C) 2018 Ben Templeman. * Copyright (C) 2018 Alphanu / Ben Templeman.
* *
* RetroArch - A frontend for libretro. * RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
@ -20,11 +20,13 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <gfx/video_driver.h> #if defined(_WIN32)
#include <windows.h>
#endif
#include "video_driver.h"
#include "video_crt_switch.h" #include "video_crt_switch.h"
#include "video_crt_win.h"
#include "video_crt_linux.h"
static float ra_tmp_core_hz; static float ra_tmp_core_hz;
static int ra_core_width; static int ra_core_width;
@ -34,132 +36,259 @@ static int ra_tmp_height;
static float fly_aspect; static float fly_aspect;
static float ra_core_hz; static float ra_core_hz;
static int ra_set_core_hz; static int ra_set_core_hz;
static int orig_width;
static int orig_height;
static int first_run;
void switch_res_core(int width, int height, float hz) void crt_switch_res_core(int width, int height, float hz)
{ {
/* ben_core_hz float passed from with in void video_driver_monitor_adjust_system_rates(void) */ /* ben_core_hz float passed from with in void video_driver_monitor_adjust_system_rates(void) */
ra_core_width = width; ra_core_width = width;
ra_core_height = height; ra_core_height = height;
ra_core_hz = hz; ra_core_hz = hz;
check_first_run(); crt_check_first_run();
if (ra_tmp_height != ra_core_height || ra_core_width != ra_tmp_width) if (ra_tmp_height != ra_core_height || ra_core_width != ra_tmp_width)
{ /* detect resolution change and switch */ { /* detect resolution change and switch */
screen_setup_aspect(width,height); crt_screen_setup_aspect(width,height);
} }
ra_tmp_height = ra_core_height;
ra_tmp_width = ra_core_width;
if (video_driver_get_aspect_ratio() != fly_aspect) if (video_driver_get_aspect_ratio() != fly_aspect)
{ /* check aspect is correct else change */ { /* check aspect is correct else change */
video_driver_set_aspect_ratio_value((float)fly_aspect); video_driver_set_aspect_ratio_value((float)fly_aspect);
crt_poke_video(); crt_poke_video();
} }
}
void crt_check_first_run()
{ /* ruin of first boot to get current display resolution */
if (first_run != 1)
{
#if defined(_WIN32)
orig_height = GetSystemMetrics(SM_CYSCREEN);
orig_width = GetSystemMetrics(SM_CXSCREEN);
#endif
}
first_run = 1;
} }
void screen_setup_aspect(int width, int height) void crt_screen_setup_aspect(int width, int height)
{ /* create correct aspect to fit video if resolution does not exist */ { /* create correct aspect to fit video if resolution does not exist */
switch_crt_hz(); switch_crt_hz();
/* get original resolution of core */ /* get original resolution of core */
if (height == 4) if (height == 4)
{ {
if (width < 1920) if (width < 1920)
{ {
width = 640; width = 640;
}/* detect menu only */ }/* detect menu only */
height = 480; height = 480;
aspect_ratio_switch(width,height); crt_aspect_ratio_switch(width,height);
} }
if (height < 191 && height != 144) if (height < 191 && height != 144)
{ {
aspect_ratio_switch(width,height); crt_aspect_ratio_switch(width,height);
height = 200; height = 200;
} }
if (height > 191) if (height > 191)
{ {
aspect_ratio_switch(width,height); crt_aspect_ratio_switch(width,height);
} }
if (height == 144 && ra_set_core_hz == 50) if (height == 144 && ra_set_core_hz == 50)
{ {
height = 288; height = 288;
aspect_ratio_switch(width,height); crt_aspect_ratio_switch(width,height);
} }
if (height > 200 && height < 224) if (height > 200 && height < 224)
{ {
aspect_ratio_switch(width,height); crt_aspect_ratio_switch(width,height);
height = 224; height = 224;
} }
if (height > 224 && height < 240) if (height > 224 && height < 240)
{ {
aspect_ratio_switch(width,height); crt_aspect_ratio_switch(width,height);
height = 240; height = 240;
} }
if (height > 240 && height < 255 )
if (height > 240 && height < 255 ) {
{ crt_aspect_ratio_switch(width,height);
aspect_ratio_switch(width,height); height = 254;
height = 254; }
} if (height == 528 && ra_set_core_hz == 60)
if (height == 528 && ra_set_core_hz == 60) {
{ crt_aspect_ratio_switch(width,height);
aspect_ratio_switch(width,height); height = 480;
height = 480; }
} if (height >= 240 && height < 255 && ra_set_core_hz == 55)
{
if (height >= 240 && height < 255 && ra_set_core_hz == 55) crt_aspect_ratio_switch(width,height);
{ height = 254;
aspect_ratio_switch(width,height); }
height = 254;
}
switch_res_crt(width, height);
switch_res_crt(width, height);
} }
void switch_res_crt(int width, int height){ void switch_res_crt(int width, int height){
if ( height > 100) if ( height > 100)
{ {
switch_res(width, height,0,ra_set_core_hz); crt_switch_res(width, height,0,ra_set_core_hz);
crt_poke_video(); crt_poke_video();
ra_tmp_height = ra_core_height; }
ra_tmp_width = ra_core_width;
}
} }
void aspect_ratio_switch(int width,int height) void crt_aspect_ratio_switch(int width,int height)
{ /* send aspect float to videeo_driver */ { /* send aspect float to videeo_driver */
fly_aspect = (float)width/height; fly_aspect = (float)width/height;
video_driver_set_aspect_ratio_value((float)fly_aspect); video_driver_set_aspect_ratio_value((float)fly_aspect);
} }
void switch_crt_hz() void switch_crt_hz()
{ /* set hz float an int for windows switching */ { /* set hz float an int for windows switching */
if (ra_core_hz != ra_tmp_core_hz) if (ra_core_hz != ra_tmp_core_hz)
{ {
if (ra_core_hz < 53 )
if (ra_core_hz < 53 ) {
{ ra_set_core_hz = 50;
ra_set_core_hz = 50; }
if (ra_core_hz >= 53 && ra_core_hz < 57)
} {
if (ra_core_hz >= 53 && ra_core_hz < 57) ra_set_core_hz = 55;
{ }
ra_set_core_hz = 55; if (ra_core_hz >= 57 )
} {
if (ra_core_hz >= 57 ) ra_set_core_hz = 60;
{ }
ra_set_core_hz = 60; video_monitor_set_refresh_rate(ra_set_core_hz);
} ra_tmp_core_hz = ra_core_hz;
video_monitor_set_refresh_rate(ra_set_core_hz); }
ra_tmp_core_hz = ra_core_hz; }
}
void crt_video_restore()
{
crt_switch_res(orig_width, orig_height,0,60);
} }
void crt_switch_res(int width, int height, int f_restore,int ra_hz)
{ /* windows function to swith resolutions */
#if defined(_WIN32)
DEVMODE curDevmode;
DEVMODE devmode;
DWORD flags = 0;
int iModeNum;
int depth = 0;
int freq;
LONG res;
if (f_restore == 0)
{
freq = ra_hz;
}
else
{
freq = 0;
}
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &curDevmode);
if (width == curDevmode.dmPelsWidth)
{
width = 0; /* used to stop superresolution bug */
}
if (width == 0)
{
width = curDevmode.dmPelsWidth;
}
if (height == 0)
{
height = curDevmode.dmPelsHeight;
}
if (depth == 0)
{
depth = curDevmode.dmBitsPerPel;
}
if (freq == 0)
{
freq = curDevmode.dmDisplayFrequency;
}
for (iModeNum = 0; ; iModeNum++)
{
if (EnumDisplaySettings(NULL, iModeNum, &devmode))
{
if (devmode.dmPelsWidth != width)
{
continue;
}
if (devmode.dmPelsHeight != height)
{
continue;
}
if (devmode.dmBitsPerPel != depth)
{
continue;
}
if (devmode.dmDisplayFrequency != freq)
{
continue;
}
devmode.dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY;
res = ChangeDisplaySettings(&devmode, CDS_TEST);
switch (res)
{
case DISP_CHANGE_SUCCESSFUL:
res = ChangeDisplaySettings(&devmode, flags);
switch (res)
{
case DISP_CHANGE_SUCCESSFUL:
return;
case DISP_CHANGE_NOTUPDATED:
return;
default:
break;
}
break;
case DISP_CHANGE_RESTART:
break;
default:
break;
}
}
else
{
break;
}
}
#endif
#if defined(linux)
#endif
}

13
gfx/video_crt_switch.h
View File

@ -1,5 +1,5 @@
/* CRT SwitchRes Core /* CRT SwitchRes Core
* Copyright (C) 2018 Ben Templeman. * Copyright (C) 2018 Alphanu / Ben Templeman.
* *
* RetroArch - A frontend for libretro. * RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
@ -17,10 +17,11 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
void switch_res_core(int width, int height, float hz); void crt_check_first_run();
void check_first_run(); void crt_switch_res_core(int width, int height, float hz);
void screen_setup_aspect(int width, int height); void crt_screen_setup_aspect(int width, int height);
void switch_res_crt(int width, int height); void switch_res_crt(int width, int height);
void aspect_ratio_switch(int width,int height); void crt_aspect_ratio_switch(int width,int height);
void switch_crt_hz(); void switch_crt_hz();
void video_restore(); void crt_video_restore();
void crt_switch_res(int width, int height, int f_restore,int ra_hz);