diff options
| author | 2022-12-03 12:09:21 -0500 | |
|---|---|---|
| committer | 2022-12-03 12:09:21 -0500 | |
| commit | 22aff09b33941cdf907e474cb86117fef838abba (patch) | |
| tree | 73a747be44fd2ba994c3d40c8f6ea18633c0f880 /src/video_core/texture_cache | |
| parent | Merge pull request #9353 from vonchenplus/draw_indexed (diff) | |
| parent | general: fix compile for Apple Clang (diff) | |
| download | yuzu-22aff09b33941cdf907e474cb86117fef838abba.tar.gz yuzu-22aff09b33941cdf907e474cb86117fef838abba.tar.xz yuzu-22aff09b33941cdf907e474cb86117fef838abba.zip | |
Merge pull request #9289 from liamwhite/fruit-company
general: fix compile for Apple Clang
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/formatter.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/texture_cache/render_targets.h | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/slot_vector.h | 1 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache_base.h | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/texture_cache/formatter.cpp b/src/video_core/texture_cache/formatter.cpp index ee4f2d406..418890126 100644 --- a/src/video_core/texture_cache/formatter.cpp +++ b/src/video_core/texture_cache/formatter.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <algorithm> | 4 | #include <algorithm> |
| 5 | #include <string> | 5 | #include <string> |
| 6 | 6 | ||
| 7 | #include "common/polyfill_ranges.h" | ||
| 7 | #include "video_core/texture_cache/formatter.h" | 8 | #include "video_core/texture_cache/formatter.h" |
| 8 | #include "video_core/texture_cache/image_base.h" | 9 | #include "video_core/texture_cache/image_base.h" |
| 9 | #include "video_core/texture_cache/image_info.h" | 10 | #include "video_core/texture_cache/image_info.h" |
diff --git a/src/video_core/texture_cache/render_targets.h b/src/video_core/texture_cache/render_targets.h index 1efbd6507..0829d773a 100644 --- a/src/video_core/texture_cache/render_targets.h +++ b/src/video_core/texture_cache/render_targets.h | |||
| @@ -13,7 +13,7 @@ namespace VideoCommon { | |||
| 13 | 13 | ||
| 14 | /// Framebuffer properties used to lookup a framebuffer | 14 | /// Framebuffer properties used to lookup a framebuffer |
| 15 | struct RenderTargets { | 15 | struct RenderTargets { |
| 16 | constexpr auto operator<=>(const RenderTargets&) const noexcept = default; | 16 | constexpr bool operator==(const RenderTargets&) const noexcept = default; |
| 17 | 17 | ||
| 18 | constexpr bool Contains(std::span<const ImageViewId> elements) const noexcept { | 18 | constexpr bool Contains(std::span<const ImageViewId> elements) const noexcept { |
| 19 | const auto contains = [elements](ImageViewId item) { | 19 | const auto contains = [elements](ImageViewId item) { |
diff --git a/src/video_core/texture_cache/slot_vector.h b/src/video_core/texture_cache/slot_vector.h index 46e8a86e6..1e2aad76a 100644 --- a/src/video_core/texture_cache/slot_vector.h +++ b/src/video_core/texture_cache/slot_vector.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include "common/assert.h" | 13 | #include "common/assert.h" |
| 14 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 15 | #include "common/polyfill_ranges.h" | ||
| 15 | 16 | ||
| 16 | namespace VideoCommon { | 17 | namespace VideoCommon { |
| 17 | 18 | ||
diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h index 9db7195bf..587339a31 100644 --- a/src/video_core/texture_cache/texture_cache_base.h +++ b/src/video_core/texture_cache/texture_cache_base.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "common/hash.h" | 16 | #include "common/hash.h" |
| 17 | #include "common/literals.h" | 17 | #include "common/literals.h" |
| 18 | #include "common/lru_cache.h" | 18 | #include "common/lru_cache.h" |
| 19 | #include "common/polyfill_ranges.h" | ||
| 19 | #include "video_core/compatible_formats.h" | 20 | #include "video_core/compatible_formats.h" |
| 20 | #include "video_core/control/channel_state_cache.h" | 21 | #include "video_core/control/channel_state_cache.h" |
| 21 | #include "video_core/delayed_destruction_ring.h" | 22 | #include "video_core/delayed_destruction_ring.h" |
| @@ -60,8 +61,6 @@ public: | |||
| 60 | TextureCacheChannelInfo(Tegra::Control::ChannelState& state) noexcept; | 61 | TextureCacheChannelInfo(Tegra::Control::ChannelState& state) noexcept; |
| 61 | TextureCacheChannelInfo(const TextureCacheChannelInfo& state) = delete; | 62 | TextureCacheChannelInfo(const TextureCacheChannelInfo& state) = delete; |
| 62 | TextureCacheChannelInfo& operator=(const TextureCacheChannelInfo&) = delete; | 63 | TextureCacheChannelInfo& operator=(const TextureCacheChannelInfo&) = delete; |
| 63 | TextureCacheChannelInfo(TextureCacheChannelInfo&& other) noexcept = default; | ||
| 64 | TextureCacheChannelInfo& operator=(TextureCacheChannelInfo&& other) noexcept = default; | ||
| 65 | 64 | ||
| 66 | DescriptorTable<TICEntry> graphics_image_table{gpu_memory}; | 65 | DescriptorTable<TICEntry> graphics_image_table{gpu_memory}; |
| 67 | DescriptorTable<TSCEntry> graphics_sampler_table{gpu_memory}; | 66 | DescriptorTable<TSCEntry> graphics_sampler_table{gpu_memory}; |