diff options
| author | 2021-06-28 23:44:03 -0400 | |
|---|---|---|
| committer | 2021-07-22 21:51:40 -0400 | |
| commit | 2e5af95541adf581364ee3864be57f9b2b9a230f (patch) | |
| tree | 939e3d203ecc1ea98fae168745004c28cdb9b007 /src/shader_recompiler/backend/glsl | |
| parent | shader: Account for 33-bit IADD3 scenario (diff) | |
| download | yuzu-2e5af95541adf581364ee3864be57f9b2b9a230f.tar.gz yuzu-2e5af95541adf581364ee3864be57f9b2b9a230f.tar.xz yuzu-2e5af95541adf581364ee3864be57f9b2b9a230f.zip | |
shader: GCC fmt 8.0.0 fixes
Diffstat (limited to 'src/shader_recompiler/backend/glsl')
| -rw-r--r-- | src/shader_recompiler/backend/glsl/emit_context.cpp | 2 | ||||
| -rw-r--r-- | src/shader_recompiler/backend/glsl/emit_context.h | 6 | ||||
| -rw-r--r-- | src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/shader_recompiler/backend/glsl/emit_context.cpp b/src/shader_recompiler/backend/glsl/emit_context.cpp index 36527bbd4..0dcdff152 100644 --- a/src/shader_recompiler/backend/glsl/emit_context.cpp +++ b/src/shader_recompiler/backend/glsl/emit_context.cpp | |||
| @@ -597,7 +597,7 @@ std::string EmitContext::DefineGlobalMemoryFunctions() { | |||
| 597 | func += comparison; | 597 | func += comparison; |
| 598 | 598 | ||
| 599 | const auto ssbo_name{fmt::format("{}_ssbo{}", stage_name, index)}; | 599 | const auto ssbo_name{fmt::format("{}_ssbo{}", stage_name, index)}; |
| 600 | func += fmt::format(return_statement, ssbo_name, ssbo_addr); | 600 | func += fmt::format(fmt::runtime(return_statement), ssbo_name, ssbo_addr); |
| 601 | }}; | 601 | }}; |
| 602 | std::string write_func{"void WriteGlobal32(uint64_t addr,uint data){"}; | 602 | std::string write_func{"void WriteGlobal32(uint64_t addr,uint data){"}; |
| 603 | std::string write_func_64{"void WriteGlobal64(uint64_t addr,uvec2 data){"}; | 603 | std::string write_func_64{"void WriteGlobal64(uint64_t addr,uvec2 data){"}; |
diff --git a/src/shader_recompiler/backend/glsl/emit_context.h b/src/shader_recompiler/backend/glsl/emit_context.h index dd7397489..d9b639d29 100644 --- a/src/shader_recompiler/backend/glsl/emit_context.h +++ b/src/shader_recompiler/backend/glsl/emit_context.h | |||
| @@ -51,9 +51,9 @@ public: | |||
| 51 | const auto var_def{var_alloc.AddDefine(inst, type)}; | 51 | const auto var_def{var_alloc.AddDefine(inst, type)}; |
| 52 | if (var_def.empty()) { | 52 | if (var_def.empty()) { |
| 53 | // skip assigment. | 53 | // skip assigment. |
| 54 | code += fmt::format(format_str + 3, std::forward<Args>(args)...); | 54 | code += fmt::format(fmt::runtime(format_str + 3), std::forward<Args>(args)...); |
| 55 | } else { | 55 | } else { |
| 56 | code += fmt::format(format_str, var_def, std::forward<Args>(args)...); | 56 | code += fmt::format(fmt::runtime(format_str), var_def, std::forward<Args>(args)...); |
| 57 | } | 57 | } |
| 58 | // TODO: Remove this | 58 | // TODO: Remove this |
| 59 | code += '\n'; | 59 | code += '\n'; |
| @@ -131,7 +131,7 @@ public: | |||
| 131 | 131 | ||
| 132 | template <typename... Args> | 132 | template <typename... Args> |
| 133 | void Add(const char* format_str, Args&&... args) { | 133 | void Add(const char* format_str, Args&&... args) { |
| 134 | code += fmt::format(format_str, std::forward<Args>(args)...); | 134 | code += fmt::format(fmt::runtime(format_str), std::forward<Args>(args)...); |
| 135 | // TODO: Remove this | 135 | // TODO: Remove this |
| 136 | code += '\n'; | 136 | code += '\n'; |
| 137 | } | 137 | } |
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp index d5424301b..580063fa9 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp | |||
| @@ -61,14 +61,14 @@ void GetCbuf(EmitContext& ctx, std::string_view ret, const IR::Value& binding, | |||
| 61 | : fmt ::format("bitfieldExtract({},int({}),{})", cbuf_cast, | 61 | : fmt ::format("bitfieldExtract({},int({}),{})", cbuf_cast, |
| 62 | bit_offset, num_bits)}; | 62 | bit_offset, num_bits)}; |
| 63 | if (!component_indexing_bug) { | 63 | if (!component_indexing_bug) { |
| 64 | const auto result{fmt::format(extraction, swizzle)}; | 64 | const auto result{fmt::format(fmt::runtime(extraction), swizzle)}; |
| 65 | ctx.Add("{}={};", ret, result); | 65 | ctx.Add("{}={};", ret, result); |
| 66 | return; | 66 | return; |
| 67 | } | 67 | } |
| 68 | const auto cbuf_offset{fmt::format("{}>>2", offset_var)}; | 68 | const auto cbuf_offset{fmt::format("{}>>2", offset_var)}; |
| 69 | for (u32 i = 0; i < 4; ++i) { | 69 | for (u32 i = 0; i < 4; ++i) { |
| 70 | const auto swizzle_string{fmt::format(".{}", "xyzw"[i])}; | 70 | const auto swizzle_string{fmt::format(".{}", "xyzw"[i])}; |
| 71 | const auto result{fmt::format(extraction, swizzle_string)}; | 71 | const auto result{fmt::format(fmt::runtime(extraction), swizzle_string)}; |
| 72 | ctx.Add("if(({}&3)=={}){}={};", cbuf_offset, i, ret, result); | 72 | ctx.Add("if(({}&3)=={}){}={};", cbuf_offset, i, ret, result); |
| 73 | } | 73 | } |
| 74 | } | 74 | } |