diff options
| author | 2021-05-09 04:08:19 -0300 | |
|---|---|---|
| committer | 2021-07-22 21:51:30 -0400 | |
| commit | 6358b0d0c1968e6491d39d36f08055f834e0030f (patch) | |
| tree | cc528a502b94eee3fdc17c377c5fa89eeed44380 /src/shader_recompiler | |
| parent | glasm: Implement more GLASM composite instructions (diff) | |
| download | yuzu-6358b0d0c1968e6491d39d36f08055f834e0030f.tar.gz yuzu-6358b0d0c1968e6491d39d36f08055f834e0030f.tar.xz yuzu-6358b0d0c1968e6491d39d36f08055f834e0030f.zip | |
glasm: Specify namespace when using FormatTo
Diffstat (limited to 'src/shader_recompiler')
| -rw-r--r-- | src/shader_recompiler/backend/glasm/reg_alloc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shader_recompiler/backend/glasm/reg_alloc.h b/src/shader_recompiler/backend/glasm/reg_alloc.h index ef0b6697f..6a238afa9 100644 --- a/src/shader_recompiler/backend/glasm/reg_alloc.h +++ b/src/shader_recompiler/backend/glasm/reg_alloc.h | |||
| @@ -136,7 +136,7 @@ struct fmt::formatter<Shader::Backend::GLASM::Id> { | |||
| 136 | } | 136 | } |
| 137 | template <typename FormatContext> | 137 | template <typename FormatContext> |
| 138 | auto format(Shader::Backend::GLASM::Id id, FormatContext& ctx) { | 138 | auto format(Shader::Backend::GLASM::Id id, FormatContext& ctx) { |
| 139 | return FormatTo<true>(ctx, id); | 139 | return Shader::Backend::GLASM::FormatTo<true>(ctx, id); |
| 140 | } | 140 | } |
| 141 | }; | 141 | }; |
| 142 | 142 | ||
| @@ -150,7 +150,7 @@ struct fmt::formatter<Shader::Backend::GLASM::Register> { | |||
| 150 | if (value.type != Shader::Backend::GLASM::Type::Register) { | 150 | if (value.type != Shader::Backend::GLASM::Type::Register) { |
| 151 | throw Shader::InvalidArgument("Register value type is not register"); | 151 | throw Shader::InvalidArgument("Register value type is not register"); |
| 152 | } | 152 | } |
| 153 | return FormatTo<false>(ctx, value.id); | 153 | return Shader::Backend::GLASM::FormatTo<false>(ctx, value.id); |
| 154 | } | 154 | } |
| 155 | }; | 155 | }; |
| 156 | 156 | ||
| @@ -164,7 +164,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarRegister> { | |||
| 164 | if (value.type != Shader::Backend::GLASM::Type::Register) { | 164 | if (value.type != Shader::Backend::GLASM::Type::Register) { |
| 165 | throw Shader::InvalidArgument("Register value type is not register"); | 165 | throw Shader::InvalidArgument("Register value type is not register"); |
| 166 | } | 166 | } |
| 167 | return FormatTo<true>(ctx, value.id); | 167 | return Shader::Backend::GLASM::FormatTo<true>(ctx, value.id); |
| 168 | } | 168 | } |
| 169 | }; | 169 | }; |
| 170 | 170 | ||
| @@ -177,7 +177,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarU32> { | |||
| 177 | auto format(const Shader::Backend::GLASM::ScalarU32& value, FormatContext& ctx) { | 177 | auto format(const Shader::Backend::GLASM::ScalarU32& value, FormatContext& ctx) { |
| 178 | switch (value.type) { | 178 | switch (value.type) { |
| 179 | case Shader::Backend::GLASM::Type::Register: | 179 | case Shader::Backend::GLASM::Type::Register: |
| 180 | return FormatTo<true>(ctx, value.id); | 180 | return Shader::Backend::GLASM::FormatTo<true>(ctx, value.id); |
| 181 | case Shader::Backend::GLASM::Type::U32: | 181 | case Shader::Backend::GLASM::Type::U32: |
| 182 | return fmt::format_to(ctx.out(), "{}", value.imm_u32); | 182 | return fmt::format_to(ctx.out(), "{}", value.imm_u32); |
| 183 | case Shader::Backend::GLASM::Type::S32: | 183 | case Shader::Backend::GLASM::Type::S32: |
| @@ -198,7 +198,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarS32> { | |||
| 198 | auto format(const Shader::Backend::GLASM::ScalarS32& value, FormatContext& ctx) { | 198 | auto format(const Shader::Backend::GLASM::ScalarS32& value, FormatContext& ctx) { |
| 199 | switch (value.type) { | 199 | switch (value.type) { |
| 200 | case Shader::Backend::GLASM::Type::Register: | 200 | case Shader::Backend::GLASM::Type::Register: |
| 201 | return FormatTo<true>(ctx, value.id); | 201 | return Shader::Backend::GLASM::FormatTo<true>(ctx, value.id); |
| 202 | case Shader::Backend::GLASM::Type::U32: | 202 | case Shader::Backend::GLASM::Type::U32: |
| 203 | return fmt::format_to(ctx.out(), "{}", static_cast<s32>(value.imm_u32)); | 203 | return fmt::format_to(ctx.out(), "{}", static_cast<s32>(value.imm_u32)); |
| 204 | case Shader::Backend::GLASM::Type::S32: | 204 | case Shader::Backend::GLASM::Type::S32: |
| @@ -219,7 +219,7 @@ struct fmt::formatter<Shader::Backend::GLASM::ScalarF32> { | |||
| 219 | auto format(const Shader::Backend::GLASM::ScalarF32& value, FormatContext& ctx) { | 219 | auto format(const Shader::Backend::GLASM::ScalarF32& value, FormatContext& ctx) { |
| 220 | switch (value.type) { | 220 | switch (value.type) { |
| 221 | case Shader::Backend::GLASM::Type::Register: | 221 | case Shader::Backend::GLASM::Type::Register: |
| 222 | return FormatTo<true>(ctx, value.id); | 222 | return Shader::Backend::GLASM::FormatTo<true>(ctx, value.id); |
| 223 | case Shader::Backend::GLASM::Type::U32: | 223 | case Shader::Backend::GLASM::Type::U32: |
| 224 | return fmt::format_to(ctx.out(), "{}", Common::BitCast<u32>(value.imm_u32)); | 224 | return fmt::format_to(ctx.out(), "{}", Common::BitCast<u32>(value.imm_u32)); |
| 225 | case Shader::Backend::GLASM::Type::S32: | 225 | case Shader::Backend::GLASM::Type::S32: |