mirror of
https://github.com/libretro/RetroArch
synced 2024-07-08 20:25:47 +00:00
4b2f27eff8
Fixed SR close match refresh bug. Added menu high resolution option. Fixed desktop restore bug cuusing endless resolution change requests. Fixed file conflicts Added destop restore resolution back in for manu only. Pulled Switchres fixes. Added better PI rsolution support. Ver 0.7 SR2 (Switchres API) Implimantation Removed HH experimetal check. This is better done via teh switchres.ini at present. Fixed refresh rate bug. Now new resolution and refesh is added correctly. Removed SR deinit from menu restore. Meanu now stays at last content resolution. Ver 0.6.2 SR2 (Switchres API) Implimantation Fixed super resolution bug casuing abnormal video size and aspect ratio Fixed logging issue casuing seg falts on RA exit Ver 0.6 SR2 (Switchres API) Implimantation Ver 0.2 SR2 (Switchres API) Implimantation Added forced super resolutions. Added Multi-monitor/monitor selection support. Added desktop resolution restore when switching back to menu only. Added new menu items for 31KHz standard and 120hz monitor profiles. Added new menu item INI. load monitor profile from switchrss.ini. Fixed winraw driver. Coordinates new refreshed after a resolution change. Fixed Menu aspect ratio in super resolutions. Removed static glabals. These have been added to videocrt_switch struct. Ver 0.1 SR2 (Switchres API) Implimantation Removed old CRTSwitchRes method. Added new SR2 API implimantaion. Resolution swithcing is now done by switchres libs. Both Linux and Windows working with native and super resolutions. Working multi-monitor support with monitor index selection. Working 31KHz support with standard and 120Hxz modes. The monitor index selection is still done via the RA UI. Only choose native and 15KHz form the CRT options in the RA UI as all options are now set in the switchres.ini. All other CRT optoins in the RA UI currently do nothing. Added SR wrapper to fix compile issues. Added back RPi functionality Fixed windows resize/scaling issues on resolution change Thanks @Calamity no more need for crt_switch_driver_refresh() Fix broken case after prevous commit Monitor preset options 15/31KHz now active. Added new meu option. Moitor persets can now be choosen fom the RA UI. 15KHz and 31KHz will set arcade_15 and aracde_31 respectivly. New option INI, if this is chosen your monitor preset will be selected from your switchres.ini file. Added 3KHhz, 120Hz. for old RA users. Renamed 31KHz to 31 KHz, Standard Fixed winraw input coordinates after switching resolution. Code cleanup Fixed menu aspect ratio issue Added menu resolution restore after closing content Fixed aspect ratio after menu resolution restore. code clean up Fxed menu Resulition Restore Aspect Ratio. When SR uses non integer scalled resolution. super width bug with restoring menu resolution fix added super resolution check after setting desktop resolutoion variables when menu active only sr_deinit() used to restore desktop mode. Fixed menu sr_deinit bug. now setting sr_active false Removed static globals, added them to video_switch struct Fixex compile bug due to comment // Fixed compile issues doe to c++ comments in teh switchres_wrapper.h Temporarily removed SR2 logging to fix compile isses for c90 added logging back in. Removed support for winnt and osx Added define for C89. Disabled SR if defined C89 Removed all RA compile fixes fro C89 C90 etc. Swithing now working again. Put Switchres behind HAVE_SR2. HAVE_SR2=no by default. --enable-sr2 Ver 0.5 SR2 Implimentation. Ver 0.4 SR2 Implimantation. Bake SR inside RA Removed temporary log files Disable switchres when C89/C99 builds. Removed C89 and C90 checks for SR Fixed switchres_wrapper.h location Ver 0.3 SR2 Implimenation Dissable logging for C89 __STDC__ Fix For RPi fixed missing EOL fixed RPi function definition added vidrocrt_switch stuct to RPI funcion fixed xoffset for RPi Removed old RPi function call SR disabled for videocore until VC4 switching ported Reverted back to state 5c8a56c Bake SR inside RA Use native win32 api for threads. Fix static lib linking LIBERROR would be defined twice otherwise + improper function names prefixed by __imp_ Added lidstc++ to makefile.common for switchres Fixed RPi switching. Disabled Switchres for videocore unill it is ported. removed RAA.log. Should not exist Added check for when SR fails to set mode with an aspect ratio fix. added video driver re init for RPi GB, GBA and GBC core check, adjusted reseolutions and scale. Please turn on integer scalling in the RA UI Added logas back in. Checking STDC verstion >= C11 Fixed c89 for loop declaration. Code clean up. Added new functions Fix resolution switching bug introduces with HH code clean up. Fixed menu restore bug on closw content after code clean up Moved SR logging to relevant RA logs Update makefile. Checks for X11 and xrandr fixed makefile Use native win32 api for threads. Fix static lib linking LIBERROR would be defined twice otherwise + improper function names prefixed by __imp_ Update switchres_wrapper.* header comments Update year copyright DRMKMS: build only if libdrm has the required version XRANDR: build only if xrandr is available Simplified maklefile Fixed RPI compile error with unsued functions. As before Disable Griffin. No switching support available. Never has been Removed log file 1 Added Win32 static define Added SR source Removed Videocore check on destroy SR Moved SR deinit to trigger earlier on RA exit. Fixed compile error after upstream rebase Fixed aspect ration bug cused by super resolutions. Temporarily disbabled SR logging Re inabled runtim eSR loggind. Disableed all RARCH logging on retro_deinit_drivers Removed srdeinit from menu restore. Menu stays in current reolution until a fix can be found Fixed refresh rate changes when no reolution change is detected. Forgot to add teh resolution cahge in with the refresh change oops Fixed endless no detection log. Removed HH check. This can been better adjusted using the switchres.ini fixed compile issue Added better PI crt switching and fixed typo Pulled Swicthres fixes. Updated desktop restore resolution. removed unused makefile Lockec menu refresh to 60hz fixed missing new line Fixed file conflicts Forced 640x480@60 for menu Added high resolution menu option Removed item logg checker Fixed typos Removed unused functions Fixed SR close match refesh bug. Fixed typo
141 lines
3.5 KiB
C
141 lines
3.5 KiB
C
/**************************************************************
|
|
|
|
modeline.h - Modeline generation header
|
|
|
|
---------------------------------------------------------
|
|
|
|
Switchres Modeline generation engine for emulation
|
|
|
|
License GPL-2.0+
|
|
Copyright 2010-2021 Chris Kennedy, Antonio Giner,
|
|
Alexandre Wodarczyk, Gil Delescluse
|
|
|
|
**************************************************************/
|
|
|
|
#ifndef __MODELINE_H__
|
|
#define __MODELINE_H__
|
|
|
|
#include <stdint.h>
|
|
#include <math.h>
|
|
#include <cstddef>
|
|
#include "monitor.h"
|
|
|
|
|
|
//============================================================
|
|
// CONSTANTS
|
|
//============================================================
|
|
|
|
// Modeline print flags
|
|
#define MS_LABEL 0x00000001
|
|
#define MS_LABEL_SDL 0x00000002
|
|
#define MS_PARAMS 0x00000004
|
|
#define MS_FULL MS_LABEL | MS_PARAMS
|
|
|
|
// Modeline result
|
|
#define R_V_FREQ_OFF 0x00000001
|
|
#define R_RES_STRETCH 0x00000002
|
|
#define R_OUT_OF_RANGE 0x00000004
|
|
|
|
// Mode types
|
|
#define MODE_OK 0x00000000
|
|
#define MODE_DESKTOP 0x01000000
|
|
#define MODE_ROTATED 0x02000000
|
|
#define MODE_DISABLED 0x04000000
|
|
#define MODE_USER_DEF 0x08000000
|
|
#define MODE_UPDATE 0x10000000
|
|
#define MODE_ADD 0x20000000
|
|
#define MODE_DELETE 0x40000000
|
|
#define MODE_ERROR 0x80000000
|
|
#define V_FREQ_EDITABLE 0x00000001
|
|
#define X_RES_EDITABLE 0x00000002
|
|
#define Y_RES_EDITABLE 0x00000004
|
|
#define SCAN_EDITABLE 0x00000008
|
|
#define XYV_EDITABLE (X_RES_EDITABLE | Y_RES_EDITABLE | V_FREQ_EDITABLE )
|
|
|
|
#define DUMMY_WIDTH 1234
|
|
#define MAX_MODELINES 256
|
|
|
|
//============================================================
|
|
// TYPE DEFINITIONS
|
|
//============================================================
|
|
|
|
typedef struct mode_result
|
|
{
|
|
int weight;
|
|
int scan_penalty;
|
|
int x_scale;
|
|
int y_scale;
|
|
int v_scale;
|
|
double x_diff;
|
|
double y_diff;
|
|
double v_diff;
|
|
double x_ratio;
|
|
double y_ratio;
|
|
double v_ratio;
|
|
} mode_result;
|
|
|
|
typedef struct modeline
|
|
{
|
|
uint64_t pclock;
|
|
int hactive;
|
|
int hbegin;
|
|
int hend;
|
|
int htotal;
|
|
int vactive;
|
|
int vbegin;
|
|
int vend;
|
|
int vtotal;
|
|
int interlace;
|
|
int doublescan;
|
|
int hsync;
|
|
int vsync;
|
|
//
|
|
double vfreq;
|
|
double hfreq;
|
|
//
|
|
int width;
|
|
int height;
|
|
int refresh;
|
|
int refresh_label;
|
|
//
|
|
int type;
|
|
int range;
|
|
uint64_t platform_data;
|
|
//
|
|
mode_result result;
|
|
} modeline;
|
|
|
|
typedef struct generator_settings
|
|
{
|
|
int interlace;
|
|
int doublescan;
|
|
uint64_t pclock_min;
|
|
bool rotation;
|
|
double monitor_aspect;
|
|
double refresh_tolerance;
|
|
int super_width;
|
|
int v_shift_correct;
|
|
int pixel_precision;
|
|
int interlace_force_even;
|
|
} generator_settings;
|
|
|
|
//============================================================
|
|
// PROTOTYPES
|
|
//============================================================
|
|
|
|
int modeline_create(modeline *s_mode, modeline *t_mode, monitor_range *range, generator_settings *cs);
|
|
int modeline_compare(modeline *t_mode, modeline *best_mode);
|
|
char * modeline_print(modeline *mode, char *modeline, int flags);
|
|
char * modeline_result(modeline *mode, char *result);
|
|
int modeline_vesa_gtf(modeline *m);
|
|
int modeline_parse(const char *user_modeline, modeline *mode);
|
|
int modeline_to_monitor_range(monitor_range *range, modeline *mode);
|
|
int modeline_is_different(modeline *n, modeline *p);
|
|
|
|
int round_near(double number);
|
|
int normalize(int a, int b);
|
|
int real_res(int x);
|
|
|
|
|
|
#endif
|