5 files changed, 8 insertions, 18 deletions

diff --git a/README.md b/README.md
index 161a5081f..2cd872097 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 4140.
+This is the source code for early-access 4141.
 
 ## Legal Notice
 
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 1d6c117b1..1f33301b7 100755
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -35,7 +35,7 @@ BufferCache<P>::BufferCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, R
     const s64 min_spacing_critical = device_local_memory - 512_MiB;

     const s64 mem_threshold = std::min(device_local_memory, TARGET_THRESHOLD);

     const s64 min_vacancy_expected = (6 * mem_threshold) / 10;

-    const s64 min_vacancy_critical = (2 * mem_threshold) / 10;

+    const s64 min_vacancy_critical = (3 * mem_threshold) / 10;

     minimum_memory = static_cast<u64>(

         std::max(std::min(device_local_memory - min_vacancy_expected, min_spacing_expected),

                  DEFAULT_EXPECTED_MEMORY));

diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp
index a94d2371a..c48e19ffa 100755
--- a/src/video_core/surface.cpp
+++ b/src/video_core/surface.cpp
@@ -3,7 +3,6 @@
 

 #include "common/common_types.h"

 #include "common/math_util.h"

-#include "common/settings.h"

 #include "video_core/surface.h"

 

 namespace VideoCore::Surface {

@@ -401,20 +400,11 @@ std::pair<u32, u32> GetASTCBlockSize(PixelFormat format) {
     return {DefaultBlockWidth(format), DefaultBlockHeight(format)};

 }

 

-u64 TranscodedAstcSize(u64 base_size, PixelFormat format) {

+u64 EstimatedDecompressedSize(u64 base_size, PixelFormat format) {

     constexpr u64 RGBA8_PIXEL_SIZE = 4;

     const u64 base_block_size = static_cast<u64>(DefaultBlockWidth(format)) *

                                 static_cast<u64>(DefaultBlockHeight(format)) * RGBA8_PIXEL_SIZE;

-    const u64 uncompressed_size = (base_size * base_block_size) / BytesPerBlock(format);

-

-    switch (Settings::values.astc_recompression.GetValue()) {

-    case Settings::AstcRecompression::Bc1:

-        return uncompressed_size / 8;

-    case Settings::AstcRecompression::Bc3:

-        return uncompressed_size / 4;

-    default:

-        return uncompressed_size;

-    }

+    return (base_size * base_block_size) / BytesPerBlock(format);

 }

 

 } // namespace VideoCore::Surface

diff --git a/src/video_core/surface.h b/src/video_core/surface.h
index 2c212a6b1..9ac9b6343 100755
--- a/src/video_core/surface.h
+++ b/src/video_core/surface.h
@@ -517,6 +517,6 @@ size_t PixelComponentSizeBitsInteger(PixelFormat format);
 

 std::pair<u32, u32> GetASTCBlockSize(PixelFormat format);

 

-u64 TranscodedAstcSize(u64 base_size, PixelFormat format);

+u64 EstimatedDecompressedSize(u64 base_size, PixelFormat format);

 

 } // namespace VideoCore::Surface

diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index f790897ef..47ea0bd96 100755
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -55,7 +55,7 @@ TextureCache<P>::TextureCache(Runtime& runtime_, Tegra::MaxwellDeviceMemoryManag
         const s64 min_spacing_critical = device_local_memory - 512_MiB;

         const s64 mem_threshold = std::min(device_local_memory, TARGET_THRESHOLD);

         const s64 min_vacancy_expected = (6 * mem_threshold) / 10;

-        const s64 min_vacancy_critical = (2 * mem_threshold) / 10;

+        const s64 min_vacancy_critical = (3 * mem_threshold) / 10;

         expected_memory = static_cast<u64>(

             std::max(std::min(device_local_memory - min_vacancy_expected, min_spacing_expected),

                      DEFAULT_EXPECTED_MEMORY));

@@ -1979,7 +1979,7 @@ void TextureCache<P>::RegisterImage(ImageId image_id) {
     if ((IsPixelFormatASTC(image.info.format) &&

          True(image.flags & ImageFlagBits::AcceleratedUpload)) ||

         True(image.flags & ImageFlagBits::Converted)) {

-        tentative_size = TranscodedAstcSize(tentative_size, image.info.format);

+        tentative_size = EstimatedDecompressedSize(tentative_size, image.info.format);

     }

     total_used_memory += Common::AlignUp(tentative_size, 1024);

     image.lru_index = lru_cache.Insert(image_id, frame_tick);

@@ -2149,7 +2149,7 @@ void TextureCache<P>::DeleteImage(ImageId image_id, bool immediate_delete) {
     if ((IsPixelFormatASTC(image.info.format) &&

          True(image.flags & ImageFlagBits::AcceleratedUpload)) ||

         True(image.flags & ImageFlagBits::Converted)) {

-        tentative_size = TranscodedAstcSize(tentative_size, image.info.format);

+        tentative_size = EstimatedDecompressedSize(tentative_size, image.info.format);

     }

     total_used_memory -= Common::AlignUp(tentative_size, 1024);

     const GPUVAddr gpu_addr = image.gpu_addr;