izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Vulkan texture dirty tracking for UI textures

Browse Source
This commit is contained in:
izzy2lost
2026-04-08 02:34:51 -04:00
parent e8cb544c98
commit 961c69a1f1
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hw/xbox/nv2a/pgraph/pgraph.c
+25 -14
View File
@@ -1160,7 +1160,9 @@ DEF_METHOD(NV097, SET_COMBINER_SPECULAR_FOG_CW1)
DEF_METHOD(NV097, SET_TEXTURE_ADDRESS)
{
int slot = (method - NV097_SET_TEXTURE_ADDRESS) / 64;
pgraph_reg_w(pg, NV_PGRAPH_TEXADDRESS0 + slot * 4, parameter);
unsigned int reg = NV_PGRAPH_TEXADDRESS0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_CONTROL0)
@@ -2628,8 +2630,9 @@ DEF_METHOD(NV097, SET_BEGIN_END)
DEF_METHOD(NV097, SET_TEXTURE_OFFSET)
{
int slot = (method - NV097_SET_TEXTURE_OFFSET) / 64;
pgraph_reg_w(pg, NV_PGRAPH_TEXOFFSET0 + slot * 4, parameter);
pg->texture_dirty[slot] = true;
unsigned int reg = NV_PGRAPH_TEXOFFSET0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_TEXTURE_FORMAT)
@@ -2656,6 +2659,7 @@ DEF_METHOD(NV097, SET_TEXTURE_FORMAT)
GET_MASK(parameter, NV097_SET_TEXTURE_FORMAT_BASE_SIZE_P);
unsigned int reg = NV_PGRAPH_TEXFMT0 + slot * 4;
uint32_t prev = pgraph_reg_r(pg, reg);
PG_SET_MASK(reg, NV_PGRAPH_TEXFMT0_CONTEXT_DMA, dma_select);
PG_SET_MASK(reg, NV_PGRAPH_TEXFMT0_CUBEMAPENABLE, cubemap);
PG_SET_MASK(reg, NV_PGRAPH_TEXFMT0_BORDER_SOURCE, border_source);
@@ -2666,35 +2670,39 @@ DEF_METHOD(NV097, SET_TEXTURE_FORMAT)
PG_SET_MASK(reg, NV_PGRAPH_TEXFMT0_BASE_SIZE_V, log_height);
PG_SET_MASK(reg, NV_PGRAPH_TEXFMT0_BASE_SIZE_P, log_depth);
pg->texture_dirty[slot] = true;
pg->texture_dirty[slot] |= (pgraph_reg_r(pg, reg) != prev);
}
DEF_METHOD(NV097, SET_TEXTURE_CONTROL0)
{
int slot = (method - NV097_SET_TEXTURE_CONTROL0) / 64;
pgraph_reg_w(pg, NV_PGRAPH_TEXCTL0_0 + slot*4, parameter);
pg->texture_dirty[slot] = true;
unsigned int reg = NV_PGRAPH_TEXCTL0_0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_TEXTURE_CONTROL1)
{
int slot = (method - NV097_SET_TEXTURE_CONTROL1) / 64;
pgraph_reg_w(pg, NV_PGRAPH_TEXCTL1_0 + slot*4, parameter);
pg->texture_dirty[slot] = true;
unsigned int reg = NV_PGRAPH_TEXCTL1_0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_TEXTURE_FILTER)
{
int slot = (method - NV097_SET_TEXTURE_FILTER) / 64;
pgraph_reg_w(pg, NV_PGRAPH_TEXFILTER0 + slot * 4, parameter);
pg->texture_dirty[slot] = true;
unsigned int reg = NV_PGRAPH_TEXFILTER0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_TEXTURE_IMAGE_RECT)
{
int slot = (method - NV097_SET_TEXTURE_IMAGE_RECT) / 64;
pgraph_reg_w(pg, NV_PGRAPH_TEXIMAGERECT0 + slot * 4, parameter);
pg->texture_dirty[slot] = true;
unsigned int reg = NV_PGRAPH_TEXIMAGERECT0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_TEXTURE_PALETTE)
@@ -2709,17 +2717,20 @@ DEF_METHOD(NV097, SET_TEXTURE_PALETTE)
GET_MASK(parameter, NV097_SET_TEXTURE_PALETTE_OFFSET);
unsigned int reg = NV_PGRAPH_TEXPALETTE0 + slot * 4;
uint32_t prev = pgraph_reg_r(pg, reg);
PG_SET_MASK(reg, NV_PGRAPH_TEXPALETTE0_CONTEXT_DMA, dma_select);
PG_SET_MASK(reg, NV_PGRAPH_TEXPALETTE0_LENGTH, length);
PG_SET_MASK(reg, NV_PGRAPH_TEXPALETTE0_OFFSET, offset);
pg->texture_dirty[slot] = true;
pg->texture_dirty[slot] |= (pgraph_reg_r(pg, reg) != prev);
}
DEF_METHOD(NV097, SET_TEXTURE_BORDER_COLOR)
{
int slot = (method - NV097_SET_TEXTURE_BORDER_COLOR) / 64;
pgraph_reg_w(pg, NV_PGRAPH_BORDERCOLOR0 + slot * 4, parameter);
unsigned int reg = NV_PGRAPH_BORDERCOLOR0 + slot * 4;
pg->texture_dirty[slot] |= (parameter != pgraph_reg_r(pg, reg));
pgraph_reg_w(pg, reg, parameter);
}
DEF_METHOD(NV097, SET_TEXTURE_SET_BUMP_ENV_MAT)
hw/xbox/nv2a/pgraph/vk/texture.c
+19 -2
View File
@@ -1431,6 +1431,10 @@ static bool check_textures_dirty(PGRAPHState *pg)
if (!r->texture_bindings[i] || pg->texture_dirty[i]) {
return true;
}
if (r->texture_bindings[i] != &r->dummy_texture &&
r->texture_bindings[i]->possibly_dirty) {
return true;
}
}
return false;
}
@@ -1483,16 +1487,29 @@ void pgraph_vk_bind_textures(NV2AState *d)
for (int i = 0; i < NV2A_MAX_TEXTURES; i++) {
if (!pgraph_is_texture_enabled(pg, i)) {
r->texture_bindings[i] = &r->dummy_texture;
if (r->texture_bindings[i] != &r->dummy_texture) {
r->texture_bindings[i] = &r->dummy_texture;
r->texture_bindings_changed = true;
}
pg->texture_dirty[i] = false;
continue;
}
if (!pg->texture_dirty[i] && r->texture_bindings[i] &&
r->texture_bindings[i] != &r->dummy_texture &&
!r->texture_bindings[i]->possibly_dirty) {
continue;
}
TextureBinding *prev_binding = r->texture_bindings[i];
create_texture(pg, i);
pg->texture_dirty[i] = false; // FIXME: Move to renderer?
if (r->texture_bindings[i] != prev_binding) {
r->texture_bindings_changed = true;
}
}
r->texture_bindings_changed = true;
update_timestamps(r);
NV2A_VK_DGROUP_END();
}