From c480c93544884b5d2b75af5577c13fb1dc303c08 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Thu, 20 May 2021 08:03:35 +0200 Subject: [PATCH] early-access version 1699 --- README.md | 2 +- src/common/fs/file.cpp | 10 +++------- src/video_core/renderer_opengl/gl_texture_cache.cpp | 7 ------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 5507ce5e2..ca22a3c72 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1698. +This is the source code for early-access 1699. ## Legal Notice diff --git a/src/common/fs/file.cpp b/src/common/fs/file.cpp index 37aa9f46e..9f3de1cb0 100755 --- a/src/common/fs/file.cpp +++ b/src/common/fs/file.cpp @@ -183,7 +183,6 @@ size_t WriteStringToFile(const std::filesystem::path& path, FileType type, size_t AppendStringToFile(const std::filesystem::path& path, FileType type, std::string_view string) { - if (!Exists(path)) { return WriteStringToFile(path, type, string); } @@ -253,13 +252,12 @@ void IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, File #ifdef _WIN32 if (flag != FileShareFlag::ShareNone) { - file = _wfsopen(path.wstring().c_str(), AccessModeToWStr(mode, type), - ToWindowsFileShareFlag(flag)); + file = _wfsopen(path.c_str(), AccessModeToWStr(mode, type), ToWindowsFileShareFlag(flag)); } else { - _wfopen_s(&file, path.wstring().c_str(), AccessModeToWStr(mode, type)); + _wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type)); } #else - file = std::fopen(PathToUTF8String(path).c_str(), AccessModeToStr(mode, type)); + file = std::fopen(path.c_str(), AccessModeToStr(mode, type)); #endif if (!IsOpen()) { @@ -349,8 +347,6 @@ u64 IOFile::GetSize() const { return 0; } - errno = 0; - std::error_code ec; const auto file_size = fs::file_size(file_path, ec); diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index f38871500..ffe9edc1b 100755 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -823,13 +823,6 @@ void Image::CopyBufferToImage(const VideoCommon::BufferImageCopy& copy, size_t b const bool is_compressed = gl_format == GL_NONE; const void* const offset = reinterpret_cast(copy.buffer_offset + buffer_offset); - if (is_compressed && !IsPixelFormatASTC(info.format) && - (copy.image_extent.width < 4 || copy.image_extent.height < 4)) { - // Per the documentation for the BPTC, S3TC, and RGTC formats, INVALID_OPERATION will be - // generated if either of the dimensions are not a multiple of four. This mainly occurs on - // small levels of mip-mapped textures, which this condition will catch. - return; - } switch (info.type) { case ImageType::e1D: if (is_compressed) {