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

diff --git a/cfgfile.cpp b/cfgfile.cpp
index a6d4ab2bd66fe61c4d0251852106982df1a17650..2f31e9c081cdf2f4ec3cf9626e30424a7785f3f5 100644 (file)
--- 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 e2e25087603a08975d29473655ff60fb8c15c98e..94155c6670db8882a5bc3746d6cddacb71a082ad 100644 (file)
--- 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 79c6db7d8536d54ecebbf81c34624342d2aa9053..d3237b457c8edde9636772cca866d486671195c2 100644 (file)
--- 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;
        }