piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8602 from lioncash/fmt

Browse Source 
Externals: Update fmt to 6.1.2
This commit is contained in:
Pierre Bourdon
2020-02-04 21:59:22 +01:00
committed by GitHub
parent 0491831483 91deb40a22
commit a205ecb446
35 changed files with 9610 additions and 5331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/SettingsHandler.cpp
View File

@ -11,7 +11,7 @@
#include <iomanip>
#include <string>
#include <fmt/time.h>
#include <fmt/chrono.h>
#include "Common/CommonTypes.h"

2
Source/Core/Core/Core.cpp
View File

@ -12,8 +12,8 @@
#include <utility>
#include <variant>
#include <fmt/chrono.h>
#include <fmt/format.h>
#include <fmt/time.h>
#ifdef _WIN32
#include <windows.h>

11
Source/Core/VideoCommon/BPStructs.cpp
View File

@ -989,7 +989,7 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
SetRegName(BPMEM_EFB_TL);
X10Y10 left_top;
left_top.hex = cmddata;
*desc = fmt::format("Left: {}\nTop: {}", left_top.x, left_top.y);
*desc = fmt::format("Left: {}\nTop: {}", u32(left_top.x), u32(left_top.y));
}
break;
@ -1183,7 +1183,7 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
"Width: {}\n"
"Height: {}\n"
"Format: {:x}\n",
texnum, teximg.width + 1, teximg.height + 1, teximg.format);
texnum, u32(teximg.width) + 1, u32(teximg.height) + 1, u32(teximg.format));
}
break;
@ -1206,8 +1206,8 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
"Even TMEM Width: {}\n"
"Even TMEM Height: {}\n"
"Cache is manually managed: {}\n",
texnum, teximg.tmem_even, teximg.cache_width, teximg.cache_height,
no_yes[teximg.image_type]);
texnum, u32(teximg.tmem_even), u32(teximg.cache_width),
u32(teximg.cache_height), no_yes[teximg.image_type]);
}
break;
@ -1229,7 +1229,8 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc)
"Odd TMEM Offset: {:x}\n"
"Odd TMEM Width: {}\n"
"Odd TMEM Height: {}\n",
texnum, teximg.tmem_odd, teximg.cache_width, teximg.cache_height);
texnum, u32(teximg.tmem_odd), u32(teximg.cache_width),
u32(teximg.cache_height));
}
break;