diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-10-15 20:47:42 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-10-15 21:24:50 +0200 |
| commit | ac4dbd3b25f022b3ef025f6d3451712187308efb (patch) | |
| tree | 0d2b2fac72afd6c8ae91935ff5c1968590bd2d8a /src | |
| parent | Merge pull request #2965 from FernandoS27/fair-core-timing (diff) | |
| download | yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.tar yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.tar.gz yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.tar.bz2 yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.tar.lz yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.tar.xz yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.tar.zst yuzu-ac4dbd3b25f022b3ef025f6d3451712187308efb.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/algorithm.h (renamed from src/common/binary_find.h) | 1 | ||||
| -rw-r--r-- | src/video_core/texture_cache/surface_base.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/texture_cache/surface_base.h | 5 |
4 files changed, 5 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..18e7ece98 100644 --- a/src/common/binary_find.h +++ b/src/common/algorithm.h @@ -5,6 +5,7 @@ #pragma once #include <algorithm> +#include <functional> 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" |