yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #8282 from liamwhite/gcc-12 

GCC 12 fixes
This commit is contained in:
Mai M 2022-04-28 23:28:07 -04:00 committed by GitHub
parent f3128fe915 709d7fd92c
commit 5687bc6e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/sirit vendored

@ -1 +1 @@
Subproject commit a39596358a3a5488c06554c0c15184a6af71e433 Subproject commit b8f133bf631ace5a613bbd7e8329300358cacbd2

2
src/common/settings.cpp
View File

@ -10,7 +10,7 @@
namespace Settings { namespace Settings {
Values values = {}; Values values;
static bool configuring_global = true; static bool configuring_global = true;
std::string GetTimeZoneString() { std::string GetTimeZoneString() {

2
src/shader_recompiler/ir_opt/verification_pass.cpp
View File

@ -43,7 +43,7 @@ static void ValidateUses(const IR::Program& program) {
} }
} }
} }
for (const auto [inst, uses] : actual_uses) { for (const auto& [inst, uses] : actual_uses) {
if (inst->UseCount() != uses) { if (inst->UseCount() != uses) {
throw LogicError("Invalid uses in block: {}", IR::DumpProgram(program)); throw LogicError("Invalid uses in block: {}", IR::DumpProgram(program));
} }

4
src/video_core/shader_environment.cpp
View File

@ -188,11 +188,11 @@ void GenericEnvironment::Serialize(std::ofstream& file) const {
.write(reinterpret_cast<const char*>(&cached_highest), sizeof(cached_highest)) .write(reinterpret_cast<const char*>(&cached_highest), sizeof(cached_highest))
.write(reinterpret_cast<const char*>(&stage), sizeof(stage)) .write(reinterpret_cast<const char*>(&stage), sizeof(stage))
.write(reinterpret_cast<const char*>(code.data()), code_size); .write(reinterpret_cast<const char*>(code.data()), code_size);
for (const auto [key, type] : texture_types) { for (const auto& [key, type] : texture_types) {
file.write(reinterpret_cast<const char*>(&key), sizeof(key)) file.write(reinterpret_cast<const char*>(&key), sizeof(key))
.write(reinterpret_cast<const char*>(&type), sizeof(type)); .write(reinterpret_cast<const char*>(&type), sizeof(type));
} }
for (const auto [key, type] : cbuf_values) { for (const auto& [key, type] : cbuf_values) {
file.write(reinterpret_cast<const char*>(&key), sizeof(key)) file.write(reinterpret_cast<const char*>(&key), sizeof(key))
.write(reinterpret_cast<const char*>(&type), sizeof(type)); .write(reinterpret_cast<const char*>(&type), sizeof(type));
} }