Skip to content

Commit 4558f94

Browse files
committed
[volt] lets rename Frame Options to Render Pipeline
1 parent c81e633 commit 4558f94

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

src/config.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ def save_config(cpu_widgets, gpu_widgets, kernel_widgets, disk_widgets, profile_
6464
if hasattr(widget, 'currentText') and widget_key != 'render_selector_apply_button':
6565
config['RenderSelector'][widget_key] = widget.currentText()
6666

67-
config['FrameControl'] = {}
68-
for widget_key, widget in gpu_widgets['frame_control'].items():
69-
if hasattr(widget, 'currentText') and widget_key != 'frame_control_apply_button':
70-
config['FrameControl'][widget_key] = widget.currentText()
67+
config['RenderPipeline'] = {}
68+
for widget_key, widget in gpu_widgets['render_pipeline'].items():
69+
if hasattr(widget, 'currentText') and widget_key != 'render_pipeline_apply_button':
70+
config['RenderPipeline'][widget_key] = widget.currentText()
7171

7272
if 'launch_options_input' in gpu_widgets['launch_options']:
7373
launch_options = gpu_widgets['launch_options']['launch_options_input'].text().replace('%', '%%')
@@ -124,10 +124,10 @@ def load_config(cpu_widgets, gpu_widgets, kernel_widgets, disk_widgets, profile_
124124
if widget_key in gpu_widgets['render_selector'] and hasattr(gpu_widgets['render_selector'][widget_key], 'setCurrentText'):
125125
gpu_widgets['render_selector'][widget_key].setCurrentText(value)
126126

127-
if 'FrameControl' in config and 'frame_control' in gpu_widgets:
128-
for widget_key, value in config['FrameControl'].items():
129-
if widget_key in gpu_widgets['frame_control'] and hasattr(gpu_widgets['frame_control'][widget_key], 'setCurrentText'):
130-
gpu_widgets['frame_control'][widget_key].setCurrentText(value)
127+
if 'RenderPipeline' in config and 'render_pipeline' in gpu_widgets:
128+
for widget_key, value in config['RenderPipeline'].items():
129+
if widget_key in gpu_widgets['render_pipeline'] and hasattr(gpu_widgets['render_pipeline'][widget_key], 'setCurrentText'):
130+
gpu_widgets['render_pipeline'][widget_key].setCurrentText(value)
131131

132132
if 'LaunchOptions' in config and 'launch_options' in gpu_widgets and 'launch_options_input' in gpu_widgets['launch_options']:
133133
launch_options = config['LaunchOptions'].get('launch_options', '').replace('%%', '%')

src/gpu_launch.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ class GPULaunchManager:
7171
("Vulkan ICD:", 'vulkan_render_combo', ["unset"]),
7272
]
7373

74-
FRAME_CONTROL_SETTINGS = [
75-
("Display Elements:", 'frame_display_combo', ["unset", "no hud", "fps only", "horizontal", "extended", "detailed"]),
76-
("Fps Limit:", 'frame_fps_limit_combo', ["unset", "unlimited", "15", "20", "24", "25", "30", "40", "45", "50", "60", "72", "75", "90", "100", "120", "144", "165", "180", "200", "240", "360"]),
77-
("Fps Limit Method:", 'frame_fps_method_combo', ["unset", "early - smoothest frametimes", "late - lowest latency"]),
74+
RENDER_PIPELINE_SETTINGS = [
75+
("Display Elements:", 'display_combo', ["unset", "no hud", "fps only", "horizontal", "extended", "detailed"]),
76+
("Fps Limit:", 'fps_limit_combo', ["unset", "unlimited", "15", "20", "24", "25", "30", "40", "45", "50", "60", "72", "75", "90", "100", "120", "144", "165", "180", "200", "240", "360"]),
77+
("Fps Limit Method:", 'fps_method_combo', ["unset", "early - smoothest frametimes", "late - lowest latency"]),
7878
("Texture Filtering:", 'texture_filter_combo', ["unset", "bicubic", "retro", "trilinear"]),
7979
("Mipmap LOD Bias:", 'mipmap_lod_bias_combo', ["unset"] + [str(i) for i in range(-16, 17)]),
8080
("Anisotropic Filtering:", 'anisotropic_filter_combo', ["unset"] + [str(i) for i in range(0, 17)]),
@@ -199,18 +199,18 @@ class GPULaunchManager:
199199
}
200200
}
201201

202-
FRAME_CONTROL_ENV_MAPPINGS = {
203-
'frame_display_combo': {
202+
RENDER_PIPELINE_ENV_MAPPINGS = {
203+
'display_combo': {
204204
'var_name': 'MANGOHUD_CONFIG',
205205
'values': {'no hud': 'preset=0', 'fps only': 'preset=1', 'horizontal': 'preset=2', 'extended': 'preset=3', 'detailed': 'preset=4',}
206206
},
207-
'frame_fps_limit_combo': {
207+
'fps_limit_combo': {
208208
'var_name': 'MANGOHUD_CONFIG',
209209
'values': {'unlimited': '0'},
210210
'direct_value': True,
211211
'prefix': 'fps_limit='
212212
},
213-
'frame_fps_method_combo': {
213+
'fps_method_combo': {
214214
'var_name': 'MANGOHUD_CONFIG',
215215
'values': {'early - smoothest frametimes': 'early', 'late - lowest latency': 'late'},
216216
'prefix': 'fps_limit_method='
@@ -294,7 +294,7 @@ def _get_vulkan_icd_options():
294294
@staticmethod
295295
def create_gpu_settings_tab():
296296
"""
297-
Creates the GPU settings tab with Mesa, NVIDIA, render selector, and frame control subtabs.
297+
Creates the GPU settings tab with Mesa, NVIDIA, render selector, and render pipeline subtabs.
298298
"""
299299
gpu_tab = QWidget()
300300
gpu_layout = QVBoxLayout(gpu_tab)
@@ -304,19 +304,19 @@ def create_gpu_settings_tab():
304304
mesa_tab, mesa_widgets = GPULaunchManager._create_mesa_tab()
305305
nvidia_tab, nvidia_widgets = GPULaunchManager._create_nvidia_tab()
306306
render_selector_tab, render_selector_widgets = GPULaunchManager._create_render_selector_tab()
307-
frame_control_tab, frame_control_widgets = GPULaunchManager._create_frame_control_tab()
307+
render_pipeline_tab, render_pipeline_widgets = GPULaunchManager._create_render_pipeline_tab()
308308

309309
gpu_subtabs.addTab(mesa_tab, "Mesa")
310310
gpu_subtabs.addTab(nvidia_tab, "NVIDIA (Proprietary)")
311311
gpu_subtabs.addTab(render_selector_tab, "Render Selector")
312-
gpu_subtabs.addTab(frame_control_tab, "Frame Control")
312+
gpu_subtabs.addTab(render_pipeline_tab, "Render Pipeline")
313313
gpu_layout.addWidget(gpu_subtabs)
314314

315315
widgets = {
316316
'mesa': mesa_widgets,
317317
'nvidia': nvidia_widgets,
318318
'render_selector': render_selector_widgets,
319-
'frame_control': frame_control_widgets
319+
'render_pipeline': render_pipeline_widgets
320320
}
321321

322322
return gpu_tab, widgets
@@ -394,19 +394,19 @@ def _create_render_selector_tab():
394394
return render_tab, widgets
395395

396396
@staticmethod
397-
def _create_frame_control_tab():
397+
def _create_render_pipeline_tab():
398398
"""
399-
Creates the frame control tab for managing FPS and display settings.
399+
Creates the render pipeline tab for managing FPS, filters and display settings.
400400
"""
401401
mangohud_available = GPULaunchManager.find_available_mangohud()
402402

403-
frame_control_tab, widgets = GPULaunchManager._create_settings_tab(GPULaunchManager.FRAME_CONTROL_SETTINGS, "frame_control_apply_button")
403+
render_pipeline_tab, widgets = GPULaunchManager._create_settings_tab(GPULaunchManager.RENDER_PIPELINE_SETTINGS, "render_pipeline_apply_button")
404404

405405
if not mangohud_available:
406406
for widget in widgets.values():
407407
widget.setEnabled(False)
408408

409-
return frame_control_tab, widgets
409+
return render_pipeline_tab, widgets
410410

411411
@staticmethod
412412
def create_launch_options_tab():
@@ -620,19 +620,19 @@ def _generate_render_selector_env_vars(render_widgets):
620620
return env_vars
621621

622622
@staticmethod
623-
def _generate_frame_control_env_vars(frame_control_widgets):
623+
def _generate_render_pipeline_env_vars(render_pipeline_widgets):
624624
"""
625-
Generates environment variables for frame control settings.
625+
Generates environment variables for render pipeline settings.
626626
"""
627627
env_vars = []
628628
mangohud_config_parts = []
629629
use_mangohud = False
630630

631-
for widget_key, mapping in GPULaunchManager.FRAME_CONTROL_ENV_MAPPINGS.items():
632-
if widget_key not in frame_control_widgets:
631+
for widget_key, mapping in GPULaunchManager.RENDER_PIPELINE_ENV_MAPPINGS.items():
632+
if widget_key not in render_pipeline_widgets:
633633
continue
634634

635-
widget = frame_control_widgets[widget_key]
635+
widget = render_pipeline_widgets[widget_key]
636636
value = widget.currentText()
637637
if value == "unset":
638638
continue
@@ -666,7 +666,7 @@ def _generate_frame_control_env_vars(frame_control_widgets):
666666
return env_vars, use_mangohud
667667

668668
@staticmethod
669-
def write_settings_file(mesa_widgets, nvidia_widgets, render_selector_widgets, frame_control_widgets, launch_options_widgets):
669+
def write_settings_file(mesa_widgets, nvidia_widgets, render_selector_widgets, render_pipeline_widgets, launch_options_widgets):
670670
"""
671671
Writes GPU settings to a temporary file for volt-helper to process.
672672
"""
@@ -678,14 +678,14 @@ def write_settings_file(mesa_widgets, nvidia_widgets, render_selector_widgets, f
678678
if 'launch_options_input' in launch_options_widgets:
679679
launch_options = launch_options_widgets['launch_options_input'].text().strip()
680680

681-
frame_env_vars, use_mangohud = GPULaunchManager._generate_frame_control_env_vars(frame_control_widgets)
681+
render_pipeline_env_vars, use_mangohud = GPULaunchManager._generate_render_pipeline_env_vars(render_pipeline_widgets)
682682

683683
if use_mangohud and launch_options:
684684
launch_options = f"mangohud {launch_options}"
685685
elif use_mangohud and not launch_options:
686686
launch_options = "mangohud"
687687

688-
all_env_vars = mesa_env_vars + nvidia_env_vars + render_env_vars + frame_env_vars
688+
all_env_vars = mesa_env_vars + nvidia_env_vars + render_env_vars + render_pipeline_env_vars
689689

690690
with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.conf') as temp_file:
691691
for env_var in all_env_vars:

src/volt-gui.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def setup_gpu_tab(self):
235235
self.gpu_widgets['mesa']['mesa_apply_button'].clicked.connect(self.apply_all_settings)
236236
self.gpu_widgets['nvidia']['nvidia_apply_button'].clicked.connect(self.apply_all_settings)
237237
self.gpu_widgets['render_selector']['render_selector_apply_button'].clicked.connect(self.apply_all_settings)
238-
self.gpu_widgets['frame_control']['frame_control_apply_button'].clicked.connect(self.apply_all_settings)
238+
self.gpu_widgets['render_pipeline']['render_pipeline_apply_button'].clicked.connect(self.apply_all_settings)
239239

240240
self.tab_widget.addTab(gpu_tab, "GPU")
241241

@@ -624,7 +624,7 @@ def apply_all_settings(self):
624624
self.gpu_widgets['mesa'],
625625
self.gpu_widgets['nvidia'],
626626
self.gpu_widgets['render_selector'],
627-
self.gpu_widgets['frame_control'],
627+
self.gpu_widgets['render_pipeline'],
628628
self.gpu_widgets['launch_options'],
629629
)
630630
if settings_file:
@@ -642,7 +642,7 @@ def apply_all_settings(self):
642642
self.gpu_widgets['mesa']['mesa_apply_button'].setEnabled(False)
643643
self.gpu_widgets['nvidia']['nvidia_apply_button'].setEnabled(False)
644644
self.gpu_widgets['render_selector']['render_selector_apply_button'].setEnabled(False)
645-
self.gpu_widgets['frame_control']['frame_control_apply_button'].setEnabled(False)
645+
self.gpu_widgets['render_pipeline']['render_pipeline_apply_button'].setEnabled(False)
646646
self.launch_options_widgets['launch_apply_button'].setEnabled(False)
647647

648648
except Exception as e:
@@ -662,7 +662,7 @@ def on_settings_applied(self, exit_code):
662662
self.gpu_widgets['mesa']['mesa_apply_button'].setEnabled(True)
663663
self.gpu_widgets['nvidia']['nvidia_apply_button'].setEnabled(True)
664664
self.gpu_widgets['render_selector']['render_selector_apply_button'].setEnabled(True)
665-
self.gpu_widgets['frame_control']['frame_control_apply_button'].setEnabled(True)
665+
self.gpu_widgets['render_pipeline']['render_pipeline_apply_button'].setEnabled(True)
666666
self.launch_options_widgets['launch_apply_button'].setEnabled(True)
667667

668668
self.refresh_cpu_values()

0 commit comments

Comments
 (0)