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

Merge pull request #2961 from lioncash/printf

Browse Source 
General: Toss out PRI macro usage
This commit is contained in:
Scott Mansell
2015-09-06 21:02:22 +12:00
parent d52d8bf935 8fdb013d54
commit be4caa3dc0
35 changed files with 71 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -259,8 +259,8 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
u64 tex_hash = XXH64(texture, texture_size, 0);
u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0;
std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016" PRIx64, width, height, has_mipmaps ? "_m" : "", tex_hash);
std::string tlutname = tlut_size ? StringFromFormat("_%016" PRIx64, tlut_hash) : "";
std::string basename = s_format_prefix + StringFromFormat("%dx%d%s_%016llx", width, height, has_mipmaps ? "_m" : "", tex_hash);
std::string tlutname = tlut_size ? StringFromFormat("_%016llx", tlut_hash) : "";
std::string formatname = StringFromFormat("_%d", format);
std::string fullname = basename + tlutname + formatname;

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

@ -312,7 +312,7 @@ void Renderer::DrawDebugText()
if (SConfig::GetInstance().m_ShowLag)
{
final_cyan += StringFromFormat("Lag: %" PRIu64 "\n", Movie::g_currentLagCount);
final_cyan += StringFromFormat("Lag: %llu\n", Movie::g_currentLagCount);
final_yellow += "\n";
}

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

@ -173,7 +173,7 @@ public:
if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b) * m_native_vtx_decl.stride))
ERROR_LOG(VIDEO, "The two vertex loaders have loaded different data "
"(guru meditation 0x%016" PRIx64 ", 0x%08x, 0x%08x, 0x%08x).",
"(guru meditation 0x%016llx, 0x%08x, 0x%08x, 0x%08x).",
m_VtxDesc.Hex, m_vat.g0.Hex, m_vat.g1.Hex, m_vat.g2.Hex);
memcpy(dst.GetPointer(), buffer_a.data(), count_a * m_native_vtx_decl.stride);