Removed the menu settings for enabling/disabling line width scaling.

Removed nv2a_vsh_cpu, glslang, SPIRV-Reflect, volk, and VulkanMemoryAllocator.

config_spec.yml

@@ -134,9 +134,6 @@ display:
     surface_scale:
       type: integer
       default: 1
-    scale_lines:
-      type: bool
-      default: true
   window:
     fullscreen_on_startup: bool
     fullscreen_exclusive: bool

hw/xbox/nv2a/nv2a.h

@@ -26,8 +26,6 @@ void nv2a_gl_context_init(void);
 int nv2a_get_framebuffer_surface(void);
 void nv2a_set_surface_scale_factor(unsigned int scale);
 unsigned int nv2a_get_surface_scale_factor(void);
-bool nv2a_get_line_width_scaling_enabled(void);
-void nv2a_set_line_width_scaling_enabled(bool enable);
 const uint8_t *nv2a_get_dac_palette(void);
 int nv2a_get_screen_off(void);
 

hw/xbox/nv2a/pgraph.c

@@ -3913,8 +3913,12 @@ void nv2a_gl_context_init(void)
     g_nv2a_context_display = glo_context_create();
 }
 
-static void apply_surface_scale_changes(NV2AState *d)
+void nv2a_set_surface_scale_factor(unsigned int scale)
 {
+    NV2AState *d = g_nv2a;
+
+    g_config.display.quality.surface_scale = MAX(1, scale);
+
     qemu_mutex_unlock_iothread();
 
     qemu_mutex_lock(&d->pfifo.lock);
@@ -3947,46 +3951,19 @@ static void apply_surface_scale_changes(NV2AState *d)
     qemu_mutex_lock_iothread();
 }
 
-void nv2a_set_surface_scale_factor(unsigned int scale)
-{
-    NV2AState *d = g_nv2a;
-
-    g_config.display.quality.surface_scale = MAX(1, scale);
-
-    apply_surface_scale_changes(d);
-}
-
 unsigned int nv2a_get_surface_scale_factor(void)
 {
     return g_nv2a->pgraph.surface_scale_factor;
 }
 
-void nv2a_set_line_width_scaling_enabled(bool enable)
-{
-    NV2AState *d = g_nv2a;
-
-    g_config.display.quality.scale_lines = enable;
-
-    apply_surface_scale_changes(d);
-}
-
-bool nv2a_get_line_width_scaling_enabled()
-{
-    return g_config.display.quality.scale_lines;
-}
-
 static void pgraph_reload_surface_scale_factor(NV2AState *d)
 {
     d->pgraph.surface_scale_factor = MAX(1, g_config.display.quality.surface_scale);
 }
 
 static void pgraph_reload_line_width(NV2AState *d)
 {
-    float lineWidth = 1.0f;
-
-    if (g_config.display.quality.scale_lines)
-        lineWidth = (float)MAX(1, g_config.display.quality.surface_scale);
-
+    float lineWidth = (float)MAX(1, g_config.display.quality.surface_scale);
     glLineWidth(lineWidth);
 }
 

ui/xui/main-menu.cc

@@ -465,12 +465,7 @@ void MainMenuDisplayView::Draw()
                      "Increase surface scaling factor for higher quality")) {
         nv2a_set_surface_scale_factor(rendering_scale+1);
     }
-    bool scale_lines = nv2a_get_line_width_scaling_enabled();
-    if(Toggle("Scale Line Widths", &scale_lines,
-           "Scale Line Widths to match Internal resolution scale")) {
-        nv2a_set_line_width_scaling_enabled(scale_lines);
-    }
-
+
     SectionTitle("Window");
     bool fs = xemu_is_fullscreen();
     if (Toggle("Fullscreen", &fs, "Enable fullscreen now")) {

ui/xui/menubar.cc

@@ -188,10 +188,6 @@ void ShowMainMenu()
             ImGui::SameLine();
             HelpMarker("Controls how the rendered content should be scaled "
                        "into the window");
-            bool scale_lines = nv2a_get_line_width_scaling_enabled();
-            if(ImGui::MenuItem("Scale Lines", SHORTCUT_MENU_TEXT(Alt + L), &scale_lines, true)) {
-                nv2a_set_line_width_scaling_enabled(scale_lines);
-            }
             ImGui::Combo("Aspect Ratio", &g_config.display.ui.aspect_ratio,
                          "Native\0Auto\0""4:3\0""16:9\0");
             if (ImGui::MenuItem("Fullscreen", SHORTCUT_MENU_TEXT(Alt + F),