summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/common/CMakeLists.txt2
-rw-r--r--src/common/algorithm.h (renamed from src/common/binary_find.h)6
-rw-r--r--src/video_core/texture_cache/surface_base.cpp1
-rw-r--r--src/video_core/texture_cache/surface_base.h5
4 files changed, 10 insertions, 4 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 906c486fd..5b51fcafa 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -95,11 +95,11 @@ add_custom_command(OUTPUT scm_rev.cpp
)
add_library(common STATIC
+ algorithm.h
alignment.h
assert.h
detached_tasks.cpp
detached_tasks.h
- binary_find.h
bit_field.h
bit_util.h
cityhash.cpp
diff --git a/src/common/binary_find.h b/src/common/algorithm.h
index 5cc523bf9..e21b1373c 100644
--- a/src/common/binary_find.h
+++ b/src/common/algorithm.h
@@ -5,6 +5,12 @@
#pragma once
#include <algorithm>
+#include <functional>
+
+// Algorithms that operate on iterators, much like the <algorithm> header.
+//
+// Note: If the algorithm is not general-purpose and/or doesn't operate on iterators,
+// it should probably not be placed within this header.
namespace Common {
diff --git a/src/video_core/texture_cache/surface_base.cpp b/src/video_core/texture_cache/surface_base.cpp
index 683c49207..829268b4c 100644
--- a/src/video_core/texture_cache/surface_base.cpp
+++ b/src/video_core/texture_cache/surface_base.cpp
@@ -2,6 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include "common/algorithm.h"
#include "common/assert.h"
#include "common/common_types.h"
#include "common/microprofile.h"
diff --git a/src/video_core/texture_cache/surface_base.h b/src/video_core/texture_cache/surface_base.h
index 5e497e49f..1bed82898 100644
--- a/src/video_core/texture_cache/surface_base.h
+++ b/src/video_core/texture_cache/surface_base.h
@@ -4,12 +4,11 @@
#pragma once
-#include <algorithm>
+#include <optional>
+#include <tuple>
#include <unordered_map>
#include <vector>
-#include "common/assert.h"
-#include "common/binary_find.h"
#include "common/common_types.h"
#include "video_core/gpu.h"
#include "video_core/morton.h"