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

confusing hack to efficient handle surface write mask changes

This commit is contained in:
espes 2015-08-14 10:04:00 +10:00
parent 81f495ef8e
commit 713baf6a03
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xbox/nv2a.c
View File

@ -1303,6 +1303,7 @@ typedef struct VertexShaderConstant {
typedef struct Surface { typedef struct Surface {
bool draw_dirty; bool draw_dirty;
bool buffer_dirty; bool buffer_dirty;
bool write_enabled_cache;
unsigned int pitch; unsigned int pitch;
hwaddr offset; hwaddr offset;
@ -3243,6 +3244,7 @@ static void pgraph_update_surface_part(NV2AState *d, bool upload, bool color) {
} }
surface->draw_dirty = false; surface->draw_dirty = false;
surface->write_enabled_cache = false;
uint8_t *out = data + surface->offset + 64; uint8_t *out = data + surface->offset + 64;
NV2A_DPRINTF("read_surface %s 0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", " NV2A_DPRINTF("read_surface %s 0x%" HWADDR_PRIx " - 0x%" HWADDR_PRIx ", "
@ -3311,12 +3313,14 @@ static void pgraph_update_surface(NV2AState *d, bool upload,
sizeof(SurfaceShape)); sizeof(SurfaceShape));
} }
if (color_write && (upload || pg->surface_color.draw_dirty)) { if ((color_write || (!upload && pg->surface_color.write_enabled_cache))
&& (upload || pg->surface_color.draw_dirty)) {
pgraph_update_surface_part(d, upload, true); pgraph_update_surface_part(d, upload, true);
} }
if (zeta_write && (upload || pg->surface_zeta.draw_dirty)) { if ((zeta_write || (!upload && pg->surface_zeta.write_enabled_cache))
&& (upload || pg->surface_zeta.draw_dirty)) {
pgraph_update_surface_part(d, upload, false); pgraph_update_surface_part(d, upload, false);
} }
} }
@ -4030,7 +4034,7 @@ static void pgraph_method(NV2AState *d,
break; break;
case NV097_SET_COLOR_MASK: { case NV097_SET_COLOR_MASK: {
pgraph_update_surface(d, false, true, true); pg->surface_color.write_enabled_cache |= pgraph_color_write_enabled(pg);
bool alpha = parameter & NV097_SET_COLOR_MASK_ALPHA_WRITE_ENABLE; bool alpha = parameter & NV097_SET_COLOR_MASK_ALPHA_WRITE_ENABLE;
bool red = parameter & NV097_SET_COLOR_MASK_RED_WRITE_ENABLE; bool red = parameter & NV097_SET_COLOR_MASK_RED_WRITE_ENABLE;
@ -4047,7 +4051,7 @@ static void pgraph_method(NV2AState *d,
break; break;
} }
case NV097_SET_DEPTH_MASK: case NV097_SET_DEPTH_MASK:
pgraph_update_surface(d, false, true, true); pg->surface_zeta.write_enabled_cache |= pgraph_zeta_write_enabled(pg);
SET_MASK(pg->regs[NV_PGRAPH_CONTROL_0], SET_MASK(pg->regs[NV_PGRAPH_CONTROL_0],
NV_PGRAPH_CONTROL_0_ZWRITEENABLE, parameter); NV_PGRAPH_CONTROL_0_ZWRITEENABLE, parameter);