early-access version 1699
This commit is contained in:
parent
a2ba3b7d14
commit
c480c93544
3 changed files with 4 additions and 15 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 1698.
|
This is the source code for early-access 1699.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -183,7 +183,6 @@ size_t WriteStringToFile(const std::filesystem::path& path, FileType type,
|
||||||
|
|
||||||
size_t AppendStringToFile(const std::filesystem::path& path, FileType type,
|
size_t AppendStringToFile(const std::filesystem::path& path, FileType type,
|
||||||
std::string_view string) {
|
std::string_view string) {
|
||||||
|
|
||||||
if (!Exists(path)) {
|
if (!Exists(path)) {
|
||||||
return WriteStringToFile(path, type, string);
|
return WriteStringToFile(path, type, string);
|
||||||
}
|
}
|
||||||
|
@ -253,13 +252,12 @@ void IOFile::Open(const fs::path& path, FileAccessMode mode, FileType type, File
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (flag != FileShareFlag::ShareNone) {
|
if (flag != FileShareFlag::ShareNone) {
|
||||||
file = _wfsopen(path.wstring().c_str(), AccessModeToWStr(mode, type),
|
file = _wfsopen(path.c_str(), AccessModeToWStr(mode, type), ToWindowsFileShareFlag(flag));
|
||||||
ToWindowsFileShareFlag(flag));
|
|
||||||
} else {
|
} else {
|
||||||
_wfopen_s(&file, path.wstring().c_str(), AccessModeToWStr(mode, type));
|
_wfopen_s(&file, path.c_str(), AccessModeToWStr(mode, type));
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
file = std::fopen(PathToUTF8String(path).c_str(), AccessModeToStr(mode, type));
|
file = std::fopen(path.c_str(), AccessModeToStr(mode, type));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!IsOpen()) {
|
if (!IsOpen()) {
|
||||||
|
@ -349,8 +347,6 @@ u64 IOFile::GetSize() const {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
errno = 0;
|
|
||||||
|
|
||||||
std::error_code ec;
|
std::error_code ec;
|
||||||
|
|
||||||
const auto file_size = fs::file_size(file_path, ec);
|
const auto file_size = fs::file_size(file_path, ec);
|
||||||
|
|
|
@ -823,13 +823,6 @@ void Image::CopyBufferToImage(const VideoCommon::BufferImageCopy& copy, size_t b
|
||||||
const bool is_compressed = gl_format == GL_NONE;
|
const bool is_compressed = gl_format == GL_NONE;
|
||||||
const void* const offset = reinterpret_cast<const void*>(copy.buffer_offset + buffer_offset);
|
const void* const offset = reinterpret_cast<const void*>(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) {
|
switch (info.type) {
|
||||||
case ImageType::e1D:
|
case ImageType::e1D:
|
||||||
if (is_compressed) {
|
if (is_compressed) {
|
||||||
|
|
Loading…
Reference in a new issue