summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Liam2022-04-28 13:22:34 -0400
committerGravatar Liam2022-04-28 16:50:34 -0400
commit709d7fd92c948dcf44897362d353d540abb38a1f (patch)
tree46fd44db803df394798c89bcebc73e8f71fc6bfd
parentMerge pull request #8260 from Morph1984/c4146 (diff)
downloadyuzu-709d7fd92c948dcf44897362d353d540abb38a1f.tar.gz
yuzu-709d7fd92c948dcf44897362d353d540abb38a1f.tar.xz
yuzu-709d7fd92c948dcf44897362d353d540abb38a1f.zip
GCC 12 fixes
m---------externals/sirit0
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/shader_recompiler/ir_opt/verification_pass.cpp2
-rw-r--r--src/video_core/shader_environment.cpp4
4 files changed, 4 insertions, 4 deletions
diff --git a/externals/sirit b/externals/sirit
Subproject a39596358a3a5488c06554c0c15184a6af71e43 Subproject b8f133bf631ace5a613bbd7e8329300358cacbd
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index fdc012355..9a9c74a70 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -10,7 +10,7 @@
10 10
11namespace Settings { 11namespace Settings {
12 12
13Values values = {}; 13Values values;
14static bool configuring_global = true; 14static bool configuring_global = true;
15 15
16std::string GetTimeZoneString() { 16std::string GetTimeZoneString() {
diff --git a/src/shader_recompiler/ir_opt/verification_pass.cpp b/src/shader_recompiler/ir_opt/verification_pass.cpp
index e2ef2b0b3..f89f4ac28 100644
--- a/src/shader_recompiler/ir_opt/verification_pass.cpp
+++ b/src/shader_recompiler/ir_opt/verification_pass.cpp
@@ -43,7 +43,7 @@ static void ValidateUses(const IR::Program& program) {
43 } 43 }
44 } 44 }
45 } 45 }
46 for (const auto [inst, uses] : actual_uses) { 46 for (const auto& [inst, uses] : actual_uses) {
47 if (inst->UseCount() != uses) { 47 if (inst->UseCount() != uses) {
48 throw LogicError("Invalid uses in block: {}", IR::DumpProgram(program)); 48 throw LogicError("Invalid uses in block: {}", IR::DumpProgram(program));
49 } 49 }
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp
index a558f8deb..d469964f6 100644
--- a/src/video_core/shader_environment.cpp
+++ b/src/video_core/shader_environment.cpp
@@ -188,11 +188,11 @@ void GenericEnvironment::Serialize(std::ofstream& file) const {
188 .write(reinterpret_cast<const char*>(&cached_highest), sizeof(cached_highest)) 188 .write(reinterpret_cast<const char*>(&cached_highest), sizeof(cached_highest))
189 .write(reinterpret_cast<const char*>(&stage), sizeof(stage)) 189 .write(reinterpret_cast<const char*>(&stage), sizeof(stage))
190 .write(reinterpret_cast<const char*>(code.data()), code_size); 190 .write(reinterpret_cast<const char*>(code.data()), code_size);
191 for (const auto [key, type] : texture_types) { 191 for (const auto& [key, type] : texture_types) {
192 file.write(reinterpret_cast<const char*>(&key), sizeof(key)) 192 file.write(reinterpret_cast<const char*>(&key), sizeof(key))
193 .write(reinterpret_cast<const char*>(&type), sizeof(type)); 193 .write(reinterpret_cast<const char*>(&type), sizeof(type));
194 } 194 }
195 for (const auto [key, type] : cbuf_values) { 195 for (const auto& [key, type] : cbuf_values) {
196 file.write(reinterpret_cast<const char*>(&key), sizeof(key)) 196 file.write(reinterpret_cast<const char*>(&key), sizeof(key))
197 .write(reinterpret_cast<const char*>(&type), sizeof(type)); 197 .write(reinterpret_cast<const char*>(&type), sizeof(type));
198 } 198 }