video settings: add r_viewfbo stuff

diff --git a/effects-high.cfg b/effects-high.cfg
index 48d0d43b87e409e030ca2ea3783fe1e7fd57bfd4..b385001d5eb235147e34d186fc87fe2704153513 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 1
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0.5
 r_shadow_gloss 1
 r_shadow_realtime_dlight 1

diff --git a/effects-low.cfg b/effects-low.cfg
index 9609a5780234582d3945e02c316c9a77d188174e..17f88444c6d238ba316eb238238ce257ead41562 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 500
 r_glsl_deluxemapping 0
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0
 r_shadow_gloss 0
 r_shadow_realtime_dlight 0

diff --git a/effects-med.cfg b/effects-med.cfg
index 94a85e5091a2146c326077707410d87142075e2f..ab4356da768e182e3ddab34d6125cabfa0e9c265 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 1000
 r_glsl_deluxemapping 0
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0
 r_shadow_gloss 0
 r_shadow_realtime_dlight 1

diff --git a/effects-normal.cfg b/effects-normal.cfg
index 7822102ba9c11e9a0a4088eecdf5550cbf108a14..8d558fc5a7ea9157c6f0f44351ea00c2c43143da 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 1000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0
 r_shadow_gloss 1
 r_shadow_realtime_dlight 1

diff --git a/effects-omg.cfg b/effects-omg.cfg
index a68a15787ded9bb5b8a10003b278054e7e29c3c3..eede2b12fae570e19efab4cd1e855b37cc39dbd5 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 250
 r_glsl_deluxemapping 0
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0
 r_shadow_gloss 0
 r_shadow_realtime_dlight 0

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index 20cd2e563870d40b2678874e6802250a2ffbe02a..268101e31839f9e31c20b7267d840d6a2edaa1cd 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 1
 r_glsl_offsetmapping_reliefmapping 1
-r_hdr 2
 r_motionblur 0.5
 r_shadow_gloss 1
 r_shadow_realtime_dlight 1

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 94d47fab2e7cfcf4a600c625ecf6b8b401d99760..0ec7293fc78954102135ae6933b0e17f648f0b9b 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -17,7 +17,6 @@ r_drawparticles_drawdistance 2000
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 1
 r_glsl_offsetmapping_reliefmapping 0
-r_hdr 0
 r_motionblur 0.5
 r_shadow_gloss 1
 r_shadow_realtime_dlight 1

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 585b2079683ba10c50434d7073d3e7b29dfacd12..fc8756b4b7a9ca314adbe12bbce645136dd84b41 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -175,9 +175,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_coronas", _("Coronas")));
                me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Use Occlusion Queries")));
        me.TR(me);
-               me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
-                       setDependent(e, "r_hdr", 0, 0);
-               me.TD(me, 1, 1.8, e = makeXonoticCheckBoxEx(2, 0, "r_hdr", _("High Dynamic Range (HDR)")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_bloom", _("High Dynamic Range (HDR)")));
        
        me.TR(me);
                s = makeXonoticSlider(0.1, 1, 0.1, "r_motionblur");

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c
index 770811ec1e8424a5c92d6ad8798d5676983e6ab4..79ad3eefe7db6100c9236209f14fd303343bc1d5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.c
+++ b/qcsrc/menu/xonotic/dialog_settings_video.c
@@ -44,14 +44,12 @@ void XonoticVideoSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "vid_fullscreen", _("Full screen")));
                me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "vid_vsync", _("Vertical Synchronization")));
-       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_gl20", _("Use OpenGL 2.0 shaders (GLSL)")));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "v_glslgamma", _("Use GLSL to handle color control")));
                        setDependent(e, "vid_gl20", 1, 1);
-       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
        me.TR(me);
@@ -62,6 +60,16 @@ void XonoticVideoSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
                me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "gl_vbo", "2", _("Vertices")));
                me.TD(me, 1, 1.9, e = makeXonoticRadioButton(1, "gl_vbo", "1", _("Vertices and Triangles")));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Frame Buffer Objects (FBOs)")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "0", _("None")));
+               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "1", _("8bpp")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "2", _("16bpp HDR")));
+               me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "r_viewfbo", "3", _("32bpp HDR")));
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Depth first:")));
@@ -70,9 +78,6 @@ void XonoticVideoSettingsTab_fill(entity me)
                        e.addValue(e, ZCTX(_("DF^World")), "1");
                        e.addValue(e, ZCTX(_("DF^All")), "2");
                        e.configureXonoticTextSliderValues(e);
-       me.TR(me);
-               if(cvar_type("apple_multithreadedgl") & CVAR_TYPEFLAG_ENGINE)
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "apple_multithreadedgl", _("Disable multithreaded OpenGL")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "gl_finish", _("Wait for GPU to finish each frame")));