vkconfig3: cleanup dead code

Change-Id: If7fd709c11a7f81ee327a5e9b86fba474557c8c8
LunarG · Dec 16, 2024 · cd0913b · cd0913b
1 parent 4851fcb
commit cd0913b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/vkconfig_core/layer_preset.cpp b/vkconfig_core/layer_preset.cpp
@@ -24,26 +24,13 @@
 
 #include <cstring>
 
-const LayerPreset* GetPreset(const std::vector<LayerPreset>& presets, const char* preset_label) {
-    assert(preset_label);
-    assert(std::strcmp(preset_label, "") != 0);
-
-    for (std::size_t i = 0, n = presets.size(); i < n; ++i) {
-        if (presets[i].label == preset_label) {
-            return &presets[i];
-        }
-    }
-
-    return nullptr;
-}
-
 bool HasPreset(const SettingDataSet& layer_settings, const SettingDataSetConst& preset_settings) {
     if (preset_settings.empty()) {
         return false;
     }
 
     for (std::size_t preset_index = 0, preset_count = preset_settings.size(); preset_index < preset_count; ++preset_index) {
-        const SettingData* layer_setting = FindSetting(layer_settings, preset_settings[preset_index]->key.c_str());
+        const SettingData* layer_setting = ::FindSetting(layer_settings, preset_settings[preset_index]->key.c_str());
         if (layer_setting == nullptr) {
             return false;
         }

diff --git a/vkconfig_core/layer_preset.h b/vkconfig_core/layer_preset.h
@@ -29,8 +29,6 @@ struct LayerPreset : public Header {
     SettingDataSetConst settings;
 };
 
-const LayerPreset* GetPreset(const std::vector<LayerPreset>& presets, const char* preset_label);
-
 // Check whether "layer_settings" has all the settings set in "preset_settings"
 // "layer_settings" may have more settings then "preset_settings" and return true
 bool HasPreset(const SettingDataSet& layer_settings, const SettingDataSetConst& preset_settings);
diff --git a/vkconfig_core/test/test_layer_preset.cpp b/vkconfig_core/test/test_layer_preset.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2020-2021 Valve Corporation
- * Copyright (c) 2020-2021 LunarG, Inc.
+ * Copyright (c) 2020-2024 Valve Corporation
+ * Copyright (c) 2020-2024 LunarG, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,21 +29,6 @@ inline SettingMetaString* InstantiateString(Layer& layer, const std::string& key
     return static_cast<SettingMetaString*>(layer.Instantiate(layer.settings, key, SETTING_STRING));
 }
 
-TEST(test_layer_preset, get_preset) {
-    LayerPreset layer_preset_a;
-    layer_preset_a.label = "1";
-
-    LayerPreset layer_preset_b;
-    layer_preset_b.label = "2";
-
-    std::vector<LayerPreset> presets;
-    presets.push_back(layer_preset_a);
-    presets.push_back(layer_preset_b);
-
-    EXPECT_STREQ("1", GetPreset(presets, "1")->label.c_str());
-    EXPECT_EQ(nullptr, GetPreset(presets, "3"));
-}
-
 TEST(test_layer_preset, has_preset) {
     Layer layer;