diff options
| author | Wunkolo <Wunkolo@gmail.com> | 2021-06-23 14:18:27 -0700 |
|---|---|---|
| committer | Wunkolo <Wunkolo@gmail.com> | 2021-06-24 09:27:40 -0700 |
| commit | 4569f39c7c1e3d7ce010f0b120e1f45dbba17b1c (patch) | |
| tree | 591792bc47e26bc812e753b0891aab94a8a88352 /src/video_core/texture_cache/texture_cache.h | |
| parent | 809e5fd52317f0a925ca463eca85a0b67d744f9e (diff) | |
common: Replace common_sizes into user-literals
Removes common_sizes.h in favor of having `_KiB`, `_MiB`, `_GiB`, etc
user-literals within literals.h.
To keep the global namespace clean, users will have to use:
```
using namespace Common::Literals;
```
to access these literals.
Diffstat (limited to 'src/video_core/texture_cache/texture_cache.h')
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index e7f8478b4..84530a179 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -19,9 +19,8 @@ #include <boost/container/small_vector.hpp> #include "common/alignment.h" -#include "common/common_funcs.h" -#include "common/common_sizes.h" #include "common/common_types.h" +#include "common/literals.h" #include "common/logging/log.h" #include "common/settings.h" #include "video_core/compatible_formats.h" @@ -59,6 +58,7 @@ using VideoCore::Surface::PixelFormat; using VideoCore::Surface::PixelFormatFromDepthFormat; using VideoCore::Surface::PixelFormatFromRenderTargetFormat; using VideoCore::Surface::SurfaceType; +using namespace Common::Literals; template <class P> class TextureCache { @@ -79,8 +79,8 @@ class TextureCache { /// Sampler ID for bugged sampler ids static constexpr SamplerId NULL_SAMPLER_ID{0}; - static constexpr u64 DEFAULT_EXPECTED_MEMORY = Common::Size_1_GB; - static constexpr u64 DEFAULT_CRITICAL_MEMORY = Common::Size_2_GB; + static constexpr u64 DEFAULT_EXPECTED_MEMORY = 1_GiB; + static constexpr u64 DEFAULT_CRITICAL_MEMORY = 2_GiB; using Runtime = typename P::Runtime; using Image = typename P::Image; @@ -400,8 +400,8 @@ TextureCache<P>::TextureCache(Runtime& runtime_, VideoCore::RasterizerInterface& minimum_memory = 0; } else { // on OGL we can be more conservatives as the driver takes care. - expected_memory = DEFAULT_EXPECTED_MEMORY + Common::Size_512_MB; - critical_memory = DEFAULT_CRITICAL_MEMORY + Common::Size_1_GB; + expected_memory = DEFAULT_EXPECTED_MEMORY + 512_MiB; + critical_memory = DEFAULT_CRITICAL_MEMORY + 1_GiB; minimum_memory = expected_memory; } } |
