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

Proper clear masks and region

This commit is contained in:
Jannik Vogel 2015-07-12 02:30:01 +02:00
parent a50409ef19
commit 414e72299e
1 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hw/xbox/nv2a.c
View File

@ -4314,15 +4314,44 @@ static void pgraph_method(NV2AState *d,
case NV097_CLEAR_SURFACE: case NV097_CLEAR_SURFACE:
NV2A_DPRINTF("---------PRE CLEAR ------\n"); NV2A_DPRINTF("---------PRE CLEAR ------\n");
GLbitfield gl_mask = 0; GLbitfield gl_mask = 0;
if (parameter & NV097_CLEAR_SURFACE_Z) {
gl_mask |= GL_DEPTH_BUFFER_BIT;
}
if (parameter & NV097_CLEAR_SURFACE_STENCIL) {
gl_mask |= GL_STENCIL_BUFFER_BIT;
}
if (parameter & (NV097_CLEAR_SURFACE_COLOR)) {
gl_mask |= GL_COLOR_BUFFER_BIT;
bool write_color = (parameter & NV097_CLEAR_SURFACE_COLOR);
bool write_zeta =
(parameter & (NV097_CLEAR_SURFACE_Z | NV097_CLEAR_SURFACE_STENCIL));
if (write_zeta) {
uint32_t clear_zstencil = d->pgraph.regs[NV_PGRAPH_ZSTENCILCLEARVALUE];
GLint gl_clear_stencil;
GLdouble gl_clear_depth;
switch(pg->surface_shape.zeta_format) {
case NV097_SET_SURFACE_FORMAT_ZETA_Z16:
//FIXME: Remove bit for stencil clear?
gl_clear_depth = (clear_zstencil & 0xFFFF) / (double)0xFFFF;
break;
case NV097_SET_SURFACE_FORMAT_ZETA_Z24S8:
gl_clear_stencil = clear_zstencil & 0xFF;
gl_clear_depth = (clear_zstencil >> 8) / (double)0xFFFFFF;
break;
default:
assert(0);
}
if (parameter & NV097_CLEAR_SURFACE_Z) {
gl_mask |= GL_DEPTH_BUFFER_BIT;
glDepthMask(GL_TRUE);
glClearDepth(gl_clear_depth);
}
if (parameter & NV097_CLEAR_SURFACE_STENCIL) {
gl_mask |= GL_STENCIL_BUFFER_BIT;
glStencilMask(0xff);
glClearStencil(gl_clear_stencil);
}
}
if (write_color) {
gl_mask |= GL_COLOR_BUFFER_BIT;
glColorMask((parameter & NV097_CLEAR_SURFACE_R)?GL_TRUE:GL_FALSE,
(parameter & NV097_CLEAR_SURFACE_G)?GL_TRUE:GL_FALSE,
(parameter & NV097_CLEAR_SURFACE_B)?GL_TRUE:GL_FALSE,
(parameter & NV097_CLEAR_SURFACE_A)?GL_TRUE:GL_FALSE);
uint32_t clear_color = d->pgraph.regs[NV_PGRAPH_COLORCLEARVALUE]; uint32_t clear_color = d->pgraph.regs[NV_PGRAPH_COLORCLEARVALUE];
glClearColor( ((clear_color >> 16) & 0xFF) / 255.0f, /* red */ glClearColor( ((clear_color >> 16) & 0xFF) / 255.0f, /* red */
((clear_color >> 8) & 0xFF) / 255.0f, /* green */ ((clear_color >> 8) & 0xFF) / 255.0f, /* green */
@ -4330,15 +4359,8 @@ static void pgraph_method(NV2AState *d,
((clear_color >> 24) & 0xFF) / 255.0f);/* alpha */ ((clear_color >> 24) & 0xFF) / 255.0f);/* alpha */
} }
bool write_color = (parameter & NV097_CLEAR_SURFACE_COLOR);
bool write_zeta =
(parameter & (NV097_CLEAR_SURFACE_Z | NV097_CLEAR_SURFACE_STENCIL));
pgraph_update_surface(d, true, write_color, write_zeta); pgraph_update_surface(d, true, write_color, write_zeta);
glColorMask(true, true, true, true);
glDepthMask(true);
glStencilMask(0xff);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
unsigned int xmin = GET_MASK(pg->regs[NV_PGRAPH_CLEARRECTX], unsigned int xmin = GET_MASK(pg->regs[NV_PGRAPH_CLEARRECTX],
@ -4349,8 +4371,8 @@ static void pgraph_method(NV2AState *d,
NV_PGRAPH_CLEARRECTY_YMIN); NV_PGRAPH_CLEARRECTY_YMIN);
unsigned int ymax = GET_MASK(pg->regs[NV_PGRAPH_CLEARRECTY], unsigned int ymax = GET_MASK(pg->regs[NV_PGRAPH_CLEARRECTY],
NV_PGRAPH_CLEARRECTY_YMAX); NV_PGRAPH_CLEARRECTY_YMAX);
glScissor(xmin, pg->surface_shape.clip_height-ymax, glScissor(xmin, /*pg->surface_shape.clip_height-ymax*/ymin,
xmax-xmin, ymax-ymin); xmax-xmin+1, ymax-ymin+1);
NV2A_DPRINTF("------------------CLEAR 0x%x %d,%d - %d,%d %x---------------\n", NV2A_DPRINTF("------------------CLEAR 0x%x %d,%d - %d,%d %x---------------\n",
parameter, xmin, ymin, xmax, ymax, d->pgraph.regs[NV_PGRAPH_COLORCLEARVALUE]); parameter, xmin, ymin, xmax, ymax, d->pgraph.regs[NV_PGRAPH_COLORCLEARVALUE]);
@ -4359,6 +4381,11 @@ static void pgraph_method(NV2AState *d,
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
//FIXME: Masks are bad now
glDepthMask(GL_TRUE);
glStencilMask(0xff);
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
pgraph_set_surface_dirty(pg, write_color, write_zeta); pgraph_set_surface_dirty(pg, write_color, write_zeta);
break; break;