cemu-project_Mirror/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-01-09 11:17:30 -03:00
Code Issues Projects Releases Packages Wiki Activity

Use portable format specifiers (#411)

Browse source 
Fixes #387
This commit is contained in:
gurrgur 2022-10-25 20:38:29 +02:00 committed by GitHub
parent 88f63ca373
commit 76c75f767b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Cafe/GraphicPack/GraphicPack2.cpp
View file

@ -11,6 +11,7 @@
#include "util/IniParser/IniParser.h" #include "util/IniParser/IniParser.h"
#include "util/helpers/StringHelpers.h" #include "util/helpers/StringHelpers.h"
#include "Cafe/CafeSystem.h" #include "Cafe/CafeSystem.h"
#include <cinttypes>
std::vector<GraphicPackPtr> GraphicPack2::s_graphic_packs; std::vector<GraphicPackPtr> GraphicPack2::s_graphic_packs;
std::vector<GraphicPackPtr> GraphicPack2::s_active_graphic_packs; std::vector<GraphicPackPtr> GraphicPack2::s_active_graphic_packs;
@ -660,7 +661,7 @@ void GraphicPack2::LoadShaders()
uint64 shader_base_hash = 0; uint64 shader_base_hash = 0;
uint64 shader_aux_hash = 0; uint64 shader_aux_hash = 0;
wchar_t shader_type[256]{}; wchar_t shader_type[256]{};
if (filename.size() < 256 && swscanf(filename.c_str(), L"%I64x_%I64x_%ls", &shader_base_hash, &shader_aux_hash, shader_type) == 3) if (filename.size() < 256 && swscanf(filename.c_str(), L"%" SCNx64 "_%" SCNx64 "_%ls", &shader_base_hash, &shader_aux_hash, shader_type) == 3)
{ {
if (shader_type[0] == 'p' && shader_type[1] == 's') if (shader_type[0] == 'p' && shader_type[1] == 's')
m_custom_shaders.emplace_back(LoadShader(p, shader_base_hash, shader_aux_hash, GP_SHADER_TYPE::PIXEL)); m_custom_shaders.emplace_back(LoadShader(p, shader_base_hash, shader_aux_hash, GP_SHADER_TYPE::PIXEL));

3
src/Cafe/HW/Latte/Core/LatteShader.cpp
View file

@ -13,6 +13,7 @@
#include "util/Zir/EmitterGLSL/ZpIREmitGLSL.h" #include "util/Zir/EmitterGLSL/ZpIREmitGLSL.h"
#include "util/Zir/Core/ZpIRDebug.h" #include "util/Zir/Core/ZpIRDebug.h"
#include "util/containers/flat_hash_map.hpp" #include "util/containers/flat_hash_map.hpp"
#include <cinttypes>
struct _ShaderHashCache struct _ShaderHashCache
{ {
@ -294,7 +295,7 @@ void LatteShader_CreateRendererShader(LatteDecompilerShader* shader, bool compil
{ {
if (shader->hasError ) if (shader->hasError )
{ {
forceLog_printf("Unable to compile shader %I64x", shader->baseHash); forceLog_printf("Unable to compile shader %" PRIx64, shader->baseHash);
return; return;
} }

4
src/Cafe/OS/libs/gx2/GX2.cpp
View file

@ -21,6 +21,8 @@
#include "GX2_Surface_Copy.h" #include "GX2_Surface_Copy.h"
#include "GX2_Texture.h" #include "GX2_Texture.h"
#include <cinttypes>
#define GX2_TV_RENDER_NONE 0 #define GX2_TV_RENDER_NONE 0
#define GX2_TV_RENDER_480 1 #define GX2_TV_RENDER_480 1
#define GX2_TV_RENDER_480_WIDE 2 #define GX2_TV_RENDER_480_WIDE 2
@ -343,7 +345,7 @@ void _GX2SubmitToTCL()
// update last submitted CB timestamp // update last submitted CB timestamp
uint64 commandBufferTimestamp = Latte_GetTime(); uint64 commandBufferTimestamp = Latte_GetTime();
LatteGPUState.lastSubmittedCommandBufferTimestamp.store(commandBufferTimestamp); LatteGPUState.lastSubmittedCommandBufferTimestamp.store(commandBufferTimestamp);
gx2Log_printf("Submitting GX2 command buffer with timestamp %016I64x", commandBufferTimestamp); gx2Log_printf("Submitting GX2 command buffer with timestamp %016" PRIx64, commandBufferTimestamp);
// submit HLE packet to write retirement timestamp // submit HLE packet to write retirement timestamp
gx2WriteGather_submitU32AsBE(pm4HeaderType3(IT_HLE_SET_CB_RETIREMENT_TIMESTAMP, 2)); gx2WriteGather_submitU32AsBE(pm4HeaderType3(IT_HLE_SET_CB_RETIREMENT_TIMESTAMP, 2));
gx2WriteGather_submitU32AsBE((uint32)(commandBufferTimestamp>>32ULL)); gx2WriteGather_submitU32AsBE((uint32)(commandBufferTimestamp>>32ULL));

9
src/tools/ShaderCacheMerger.cpp
View file

@ -1,12 +1,13 @@
#include "Cemu/FileCache/FileCache.h" #include "Cemu/FileCache/FileCache.h"
#include "Cafe/HW/Latte/Core/LatteShaderCache.h" #include "Cafe/HW/Latte/Core/LatteShaderCache.h"
#include <regex> #include <regex>
#include <cinttypes>
void MergeShaderCacheFile(std::string fileName) void MergeShaderCacheFile(std::string fileName)
{ {
// parse titleId from fileName // parse titleId from fileName
uint64 titleId = 0; uint64 titleId = 0;
if (sscanf(fileName.c_str(), "%I64x", &titleId) != 1) if (sscanf(fileName.c_str(), "%" SCNx64, &titleId) != 1)
return; return;
const std::string mainPath = "shaderCache/transferable/" + fileName; const std::string mainPath = "shaderCache/transferable/" + fileName;
@ -26,7 +27,7 @@ void MergeShaderCacheFile(std::string fileName)
return; return;
} }
// begin merging // begin merging
printf("Merging shaders %I64x...", titleId); printf("Merging shaders %" PRIx64 "...", titleId);
uint32 numMergedEntries = 0; // number of files added to the main cache file uint32 numMergedEntries = 0; // number of files added to the main cache file
for (sint32 i = 0; i < sourceCache->GetFileCount(); i++) for (sint32 i = 0; i < sourceCache->GetFileCount(); i++)
{ {
@ -52,7 +53,7 @@ void MergePipelineCacheFile(std::string fileName)
{ {
// parse titleId from fileName // parse titleId from fileName
uint64 titleId = 0; uint64 titleId = 0;
if (sscanf(fileName.c_str(), "%I64x", &titleId) != 1) if (sscanf(fileName.c_str(), "%" SCNx64, &titleId) != 1)
return; return;
const std::string mainPath = "shaderCache/transferable/" + fileName; const std::string mainPath = "shaderCache/transferable/" + fileName;
@ -73,7 +74,7 @@ void MergePipelineCacheFile(std::string fileName)
return; return;
} }
// begin merging // begin merging
printf("Merging pipelines %I64x...", titleId); printf("Merging pipelines %" PRIx64 "...", titleId);
uint32 numMergedEntries = 0; // number of files added to the main cache file uint32 numMergedEntries = 0; // number of files added to the main cache file
for (sint32 i = 0; i < sourceCache->GetFileCount(); i++) for (sint32 i = 0; i < sourceCache->GetFileCount(); i++)
{ {