diff options
| author | 2021-09-12 12:01:23 -0400 | |
|---|---|---|
| committer | 2021-09-12 12:01:23 -0400 | |
| commit | 74030eb4277c179c62189a978b693e081bfe7c4c (patch) | |
| tree | e2f4ba2fa65f8b9bdfbd86352a65539f46d9193f /src/video_core | |
| parent | Merge pull request #6986 from Morph1984/version-update (diff) | |
| parent | shader_environment: Add missing <algorithm> include (diff) | |
| download | yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.gz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.tar.xz yuzu-74030eb4277c179c62189a978b693e081bfe7c4c.zip | |
Merge pull request #6987 from Morph1984/common-error
common: Move error handling functions out of common_funcs
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.h | 1 | ||||
| -rw-r--r-- | src/video_core/memory_manager.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_descriptor_pool.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/shader_environment.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/texture_cache/slot_vector.h | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/src/video_core/command_classes/codecs/codec.h b/src/video_core/command_classes/codecs/codec.h index 1508d36c2..f9a80886f 100644 --- a/src/video_core/command_classes/codecs/codec.h +++ b/src/video_core/command_classes/codecs/codec.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <string_view> | ||
| 8 | #include <queue> | 9 | #include <queue> |
| 9 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 10 | #include "video_core/command_classes/nvdec_common.h" | 11 | #include "video_core/command_classes/nvdec_common.h" |
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index c60ed6453..dce00e829 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 6 | |||
| 5 | #include "common/alignment.h" | 7 | #include "common/alignment.h" |
| 6 | #include "common/assert.h" | 8 | #include "common/assert.h" |
| 7 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
diff --git a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp index 8e77e4796..adb557f60 100644 --- a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 5 | #include <mutex> | 6 | #include <mutex> |
| 6 | #include <span> | 7 | #include <span> |
| 7 | #include <vector> | 8 | #include <vector> |
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index 8a4581c19..81a878bb2 100644 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <algorithm> | ||
| 5 | #include <filesystem> | 6 | #include <filesystem> |
| 6 | #include <fstream> | 7 | #include <fstream> |
| 7 | #include <memory> | 8 | #include <memory> |
diff --git a/src/video_core/texture_cache/slot_vector.h b/src/video_core/texture_cache/slot_vector.h index 6180b8c0e..74cd3c9d8 100644 --- a/src/video_core/texture_cache/slot_vector.h +++ b/src/video_core/texture_cache/slot_vector.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <algorithm> | ||
| 7 | #include <array> | 8 | #include <array> |
| 8 | #include <bit> | 9 | #include <bit> |
| 9 | #include <concepts> | 10 | #include <concepts> |