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

nv2a: Move palette offset behind texture reuse check

This commit is contained in:
Erik Abair 2022-05-17 17:30:28 -07:00 committed by mborgerson
parent b0f20c9bba
commit b9aef0c57c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/xbox/nv2a/pgraph.c
View File

@ -6179,6 +6179,15 @@ static void pgraph_bind_textures(NV2AState *d)
texture_data += offset; texture_data += offset;
hwaddr texture_vram_offset = texture_data - d->vram_ptr; hwaddr texture_vram_offset = texture_data - d->vram_ptr;
SurfaceBinding *surface = pgraph_surface_get(d, texture_vram_offset);
TextureBinding *tbind = pg->texture_binding[i];
if (!pg->texture_dirty[i] && tbind &&
(!surface || tbind->draw_time == surface->draw_time)) {
glBindTexture(pg->texture_binding[i]->gl_target,
pg->texture_binding[i]->gl_texture);
continue;
}
hwaddr palette_dma_len; hwaddr palette_dma_len;
uint8_t *palette_data; uint8_t *palette_data;
if (palette_dma_select) { if (palette_dma_select) {
@ -6190,15 +6199,6 @@ static void pgraph_bind_textures(NV2AState *d)
palette_data += palette_offset; palette_data += palette_offset;
hwaddr palette_vram_offset = palette_data - d->vram_ptr; hwaddr palette_vram_offset = palette_data - d->vram_ptr;
SurfaceBinding *surface = pgraph_surface_get(d, texture_vram_offset);
TextureBinding *tbind = pg->texture_binding[i];
if (!pg->texture_dirty[i] && tbind &&
(!surface || tbind->draw_time == surface->draw_time)) {
glBindTexture(pg->texture_binding[i]->gl_target,
pg->texture_binding[i]->gl_texture);
continue;
}
NV2A_DPRINTF(" texture %d is format 0x%x, " NV2A_DPRINTF(" texture %d is format 0x%x, "
"off 0x%" HWADDR_PRIx " (r %d, %d or %d, %d, %d; %d%s)," "off 0x%" HWADDR_PRIx " (r %d, %d or %d, %d, %d; %d%s),"
" filter %x %x, levels %d-%d %d bias %d\n", " filter %x %x, levels %d-%d %d bias %d\n",