ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nv2a/vk,gl: Fix a couple 64b shift/printing bugs

This commit is contained in:
Matt Borgerson 2024-12-31 00:57:53 -07:00 committed by mborgerson
parent ae3fe91223
commit e67f19d03b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xbox/nv2a/pgraph/gl/shaders.c
View File

@ -376,17 +376,15 @@ bool pgraph_gl_shader_load_from_memory(ShaderLruNode *snode)
static char *shader_get_bin_directory(uint64_t hash)
{
const char *cfg_dir = xemu_settings_get_base_path();
uint64_t bin_mask = 0xffffUL << 48;
char *shader_bin_dir = g_strdup_printf("%s/shaders/%04lx",
cfg_dir, (hash & bin_mask) >> 48);
char *shader_bin_dir =
g_strdup_printf("%s/shaders/%04x", cfg_dir, (uint32_t)(hash >> 48));
return shader_bin_dir;
}
static char *shader_get_binary_path(const char *shader_bin_dir, uint64_t hash)
{
uint64_t bin_mask = 0xffffUL << 48;
return g_strdup_printf("%s/%012lx", shader_bin_dir,
hash & (~bin_mask));
uint64_t bin_mask = (uint64_t)0xffff << 48;
return g_strdup_printf("%s/%012" PRIx64, shader_bin_dir, hash & ~bin_mask);
}
static void shader_load_from_disk(PGRAPHState *pg, uint64_t hash)

2
hw/xbox/nv2a/pgraph/vk/shaders.c
View File

@ -377,7 +377,7 @@ static ShaderBinding *gen_shaders(PGRAPHState *pg, ShaderState *state)
LruNode *node = lru_lookup(&r->shader_cache, hash, state);
ShaderBinding *snode = container_of(node, ShaderBinding, node);
NV2A_VK_DPRINTF("shader state hash: %016lx, %p", hash, snode);
NV2A_VK_DPRINTF("shader state hash: %016" PRIx64 " %p", hash, snode);
if (!snode->initialized) {
NV2A_VK_DPRINTF("cache miss");