From c92b8dc9641b4c7b099dcbc1c1bd50758779d67c Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 16 Jul 2020 04:14:58 +1000 Subject: [PATCH] Don't display VBO options in the menu if the gl_vbo setting doesn't exist in the engine --- qcsrc/menu/xonotic/dialog_settings_video.qc | 3 +++ xonotic-client.cfg | 1 + 2 files changed, 4 insertions(+) diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc index 849fa435bf..c43e0af994 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.qc +++ b/qcsrc/menu/xonotic/dialog_settings_video.qc @@ -102,6 +102,8 @@ void XonoticVideoSettingsTab_fill(entity me) e.addValue(e, ZCTX(_("DF^All")), "2"); e.configureXonoticTextSliderValues(e); me.TR(me); + if(cvar_type("gl_vbo") & CVAR_TYPEFLAG_ENGINE) + { me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)"))); me.TR(me); me.TDempty(me, 0.2); @@ -114,6 +116,7 @@ void XonoticVideoSettingsTab_fill(entity me) _("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering"))); me.TD(me, 1, 1.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "1", _("Vertices and Triangles"), _("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering"))); + } me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Brightness:"))); diff --git a/xonotic-client.cfg b/xonotic-client.cfg index e3e523bd9f..cab4d561f2 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -303,6 +303,7 @@ seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate wall cl_stainmaps 0 cl_particles_smoke 1 set vid_gl20 1 +set gl_vbo 3 r_glsl_deluxemapping 1 r_glsl_offsetmapping 0 r_glsl_offsetmapping_lod 1 -- 2.39.2