history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-26 18:15:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc: Fix a couple of fmt errors

Browse Source
This commit is contained in:
Stenzek 2023-11-28 13:51:04 +10:00
parent 0af059aae2
commit 333c9fdf6f
No known key found for this signature in database
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/small_string.h
View File

@ -329,18 +329,25 @@ ALWAYS_INLINE void SmallStringBase::fmt(fmt::format_string<T...> fmt, T&&... arg
#pragma warning(pop) #pragma warning(pop)
#endif #endif
template<> #define MAKE_FORMATTER(type) \
struct fmt::formatter<SmallStringBase> template<> \
{ struct fmt::formatter<type> \
template<typename ParseContext> { \
constexpr auto parse(ParseContext& ctx) template<typename ParseContext> \
{ constexpr auto parse(ParseContext& ctx) \
return ctx.begin(); { \
} return ctx.begin(); \
} \
\
template<typename FormatContext> \
auto format(const type& str, FormatContext& ctx) \
{ \
return fmt::format_to(ctx.out(), "{}", str.view()); \
} \
};
template<typename FormatContext> MAKE_FORMATTER(TinyString);
auto format(const SmallStringBase& str, FormatContext& ctx) MAKE_FORMATTER(SmallString);
{ MAKE_FORMATTER(LargeString);
return fmt::format_to(ctx.out(), "{}", str.view());
} #undef MAKE_FORMATTER
};

6
src/util/opengl_pipeline.cpp
View File

@ -358,9 +358,9 @@ GLuint OpenGLDevice::CompileProgram(const GPUPipeline::GraphicsConfig& plconfig)
} }
else else
{ {
glBindAttribLocation( glBindAttribLocation(program_id, i,
program_id, i, TinyString::from_fmt("{}{}", semantic_vars[static_cast<u8>(va.semantic.GetValue())],
TinyString::from_fmt("{}{}", semantic_vars[static_cast<u8>(va.semantic.GetValue())], va.semantic_index)); static_cast<u8>(va.semantic_index)));
} }
} }