Browse Source

Merge pull request #8282 from liamwhite/gcc-12

GCC 12 fixes
pull/15/merge
Mai M 4 years ago
committed by GitHub
parent
commit
5687bc6e10
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      externals/sirit
  2. 2
      src/common/settings.cpp
  3. 2
      src/shader_recompiler/ir_opt/verification_pass.cpp
  4. 4
      src/video_core/shader_environment.cpp

2
externals/sirit

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

2
src/common/settings.cpp

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

2
src/shader_recompiler/ir_opt/verification_pass.cpp

@ -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) {
throw LogicError("Invalid uses in block: {}", IR::DumpProgram(program));
}

4
src/video_core/shader_environment.cpp

@ -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*>(&stage), sizeof(stage))
.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))
.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))
.write(reinterpret_cast<const char*>(&type), sizeof(type));
}

Loading…
Cancel
Save