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
124 lines
3.8 KiB
C++
124 lines
3.8 KiB
C++
/**************************************************************
|
|
|
|
custom_video_xrandr.h - Linux XRANDR video management layer
|
|
|
|
---------------------------------------------------------
|
|
|
|
Switchres Modeline generation engine for emulation
|
|
|
|
License GPL-2.0+
|
|
Copyright 2010-2021 Chris Kennedy, Antonio Giner,
|
|
Alexandre Wodarczyk, Gil Delescluse
|
|
|
|
**************************************************************/
|
|
|
|
#ifndef __CUSTOM_VIDEO_XRANDR__
|
|
#define __CUSTOM_VIDEO_XRANDR__
|
|
|
|
// X11 Xrandr headers
|
|
#include <X11/extensions/Xrandr.h>
|
|
#include "custom_video.h"
|
|
|
|
// Set timing option flags
|
|
#define XRANDR_DISABLE_CRTC_RELOCATION 0x00000001
|
|
#define XRANDR_ENABLE_SCREEN_REORDERING 0x00000002
|
|
|
|
// Set timing internal flags
|
|
#define XRANDR_SETMODE_IS_DESKTOP 0x00000001
|
|
#define XRANDR_SETMODE_RESTORE_DESKTOP 0x00000002
|
|
#define XRANDR_SETMODE_UPDATE_DESKTOP_CRTC 0x00000010
|
|
#define XRANDR_SETMODE_UPDATE_OTHER_CRTC 0x00000020
|
|
#define XRANDR_SETMODE_UPDATE_REORDERING 0x00000040
|
|
|
|
#define XRANDR_SETMODE_INFO_MASK 0x0000000F
|
|
#define XRANDR_SETMODE_UPDATE_MASK 0x000000F0
|
|
|
|
// Super resolution placement, vertical stacking, reserved XRANDR_REORDERING_MAXIMUM_HEIGHT pixels
|
|
//TODO confirm 1024 height is sufficient
|
|
#define XRANDR_REORDERING_MAXIMUM_HEIGHT 1024
|
|
|
|
class xrandr_timing : public custom_video
|
|
{
|
|
public:
|
|
xrandr_timing(char *device_name, custom_video_settings *vs);
|
|
~xrandr_timing();
|
|
const char *api_name() { return "XRANDR"; }
|
|
int caps() { return CUSTOM_VIDEO_CAPS_ADD; }
|
|
bool init();
|
|
|
|
bool add_mode(modeline *mode);
|
|
bool delete_mode(modeline *mode);
|
|
bool update_mode(modeline *mode);
|
|
|
|
bool get_timing(modeline *mode);
|
|
bool set_timing(modeline *mode);
|
|
|
|
bool process_modelist(std::vector<modeline *>);
|
|
|
|
static int ms_xerrors;
|
|
static int ms_xerrors_flag;
|
|
|
|
private:
|
|
int m_id = 0;
|
|
int m_managed = 0;
|
|
int m_enable_screen_reordering = 0;
|
|
int m_enable_screen_compositing = 0;
|
|
|
|
XRRModeInfo *find_mode(modeline *mode);
|
|
XRRModeInfo *find_mode_by_name(char *name);
|
|
|
|
bool set_timing(modeline *mode, int flags);
|
|
|
|
int m_video_modes_position = 0;
|
|
char m_device_name[32];
|
|
Rotation m_desktop_rotation;
|
|
unsigned int m_min_width;
|
|
unsigned int m_max_width;
|
|
unsigned int m_min_height;
|
|
unsigned int m_max_height;
|
|
|
|
Display *m_pdisplay = NULL;
|
|
Window m_root;
|
|
int m_screen;
|
|
|
|
int m_desktop_output = -1;
|
|
XRRModeInfo m_desktop_mode = {};
|
|
int m_crtc_flags = 0;
|
|
|
|
XRRCrtcInfo m_last_crtc = {};
|
|
|
|
void *m_xrandr_handle = 0;
|
|
|
|
__typeof__(XRRAddOutputMode) *p_XRRAddOutputMode;
|
|
__typeof__(XRRConfigCurrentConfiguration) *p_XRRConfigCurrentConfiguration;
|
|
__typeof__(XRRCreateMode) *p_XRRCreateMode;
|
|
__typeof__(XRRDeleteOutputMode) *p_XRRDeleteOutputMode;
|
|
__typeof__(XRRDestroyMode) *p_XRRDestroyMode;
|
|
__typeof__(XRRFreeCrtcInfo) *p_XRRFreeCrtcInfo;
|
|
__typeof__(XRRFreeOutputInfo) *p_XRRFreeOutputInfo;
|
|
__typeof__(XRRFreeScreenConfigInfo) *p_XRRFreeScreenConfigInfo;
|
|
__typeof__(XRRFreeScreenResources) *p_XRRFreeScreenResources;
|
|
__typeof__(XRRGetCrtcInfo) *p_XRRGetCrtcInfo;
|
|
__typeof__(XRRGetOutputInfo) *p_XRRGetOutputInfo;
|
|
__typeof__(XRRGetScreenInfo) *p_XRRGetScreenInfo;
|
|
__typeof__(XRRGetScreenResourcesCurrent) *p_XRRGetScreenResourcesCurrent;
|
|
__typeof__(XRRQueryVersion) *p_XRRQueryVersion;
|
|
__typeof__(XRRSetCrtcConfig) *p_XRRSetCrtcConfig;
|
|
__typeof__(XRRSetScreenSize) *p_XRRSetScreenSize;
|
|
__typeof__(XRRGetScreenSizeRange) *p_XRRGetScreenSizeRange;
|
|
|
|
void *m_x11_handle = 0;
|
|
|
|
__typeof__(XCloseDisplay) *p_XCloseDisplay;
|
|
__typeof__(XGrabServer) *p_XGrabServer;
|
|
__typeof__(XOpenDisplay) *p_XOpenDisplay;
|
|
__typeof__(XSync) *p_XSync;
|
|
__typeof__(XUngrabServer) *p_XUngrabServer;
|
|
__typeof__(XSetErrorHandler) *p_XSetErrorHandler;
|
|
__typeof__(XClearWindow) *p_XClearWindow;
|
|
__typeof__(XFillRectangle) *p_XFillRectangle;
|
|
__typeof__(XCreateGC) *p_XCreateGC;
|
|
};
|
|
|
|
#endif
|