From: Toni Wilen <twilen@winuae.net>
Date: Mon, 9 Dec 2019 17:31:17 +0000 (+0200)
Subject: Added manual HDR enable config file entry, don't enable it by default.
X-Git-Tag: 4300~13
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=b89a4571943258985228625f39aa4a2e3d96a6a8;p=francis%2Fwinuae.git

Added manual HDR enable config file entry, don't enable it by default.
---

diff --git a/cfgfile.cpp b/cfgfile.cpp
index a6d4ab2b..2f31e9c0 100644
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -2177,6 +2177,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
 	cfgfile_dwrite(f, _T("gfx_black_frame_insertion_ratio"), _T("%d"), p->lightboost_strobo_ratio);
 	cfgfile_write_str(f, _T("gfx_api"), filterapi[p->gfx_api]);
 	cfgfile_write_str(f, _T("gfx_api_options"), filterapiopts[p->gfx_api_options]);
+	cfgfile_dwrite_bool(f, _T("gfx_hdr"), p->gfx_hdr);
 	cfgfile_dwrite(f, _T("gfx_horizontal_tweak"), _T("%d"), p->gfx_extrawidth);
 	cfgfile_dwrite(f, _T("gfx_frame_slices"), _T("%d"), p->gfx_display_sections);
 	cfgfile_dwrite_bool(f, _T("gfx_vrr_monitor"), p->gfx_variable_sync != 0);
@@ -3343,6 +3344,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
 		|| cfgfile_yesno(option, value, _T("gfx_black_frame_insertion"), &p->lightboost_strobo)
 		|| cfgfile_yesno(option, value, _T("gfx_flickerfixer"), &p->gfx_scandoubler)
 		|| cfgfile_yesno(option, value, _T("gfx_autoresolution_vga"), &p->gfx_autoresolution_vga)
+		|| cfgfile_yesno(option, value, _T("gfx_hdr"), &p->gfx_hdr)
 		|| cfgfile_yesno(option, value, _T("show_refresh_indicator"), &p->refresh_indicator)
 		|| cfgfile_yesno(option, value, _T("warp"), &p->turbo_emulation)
 		|| cfgfile_yesno(option, value, _T("headless"), &p->headless)
diff --git a/include/options.h b/include/options.h
index e2e25087..94155c66 100644
--- a/include/options.h
+++ b/include/options.h
@@ -554,6 +554,7 @@ struct uae_prefs {
 	bool gfx_blackerthanblack;
 	int gfx_threebitcolors;
 	int gfx_api;
+	bool gfx_hdr;
 	int gfx_api_options;
 	int color_mode;
 	int gfx_extrawidth;
diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index 79c6db7d..d3237b45 100644
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -3454,7 +3454,7 @@ static int xxD3D11_init2(HWND ahwnd, int monid, int w_w, int w_h, int t_w, int t
 				desc1.WhitePoint[0], desc1.WhitePoint[1]);
 			write_log(_T("MinL=%f MaxL=%f MaxFFL=%f\n"),
 				desc1.MinLuminance, desc1.MaxLuminance, desc1.MaxFullFrameLuminance);
-			d3d->hdr = desc1.ColorSpace == DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
+			d3d->hdr = desc1.ColorSpace == DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 && currprefs.gfx_hdr;
 		}
 		adapterOutputx = adapterOutput6;
 	}