diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-09-06 21:02:22 +1200 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-09-06 21:02:22 +1200 |
| commit | be4caa3dc025d18d57cf53b27e505c19bb70544e (patch) | |
| tree | 05e246462f966736dff64a897b6441b36600f996 /Source/Core/VideoCommon | |
| parent | d52d8bf93514f7fa5492abc7bff33162148972c1 (diff) | |
| parent | 8fdb013d540cf5d79a23888053fda2897f997e61 (diff) | |
Merge pull request #2961 from lioncash/printf
General: Toss out PRI macro usage
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderBase.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index e6f687a551..3057740f0e 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -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; diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 55a6cb8760..a6f2897fe7 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -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"; } diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index 681f43b4fa..c23e9a1f36 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -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); |