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

Cleanup clear code

This commit is contained in:
Jannik Vogel 2015-07-13 17:53:18 +02:00
parent 414e72299e
commit a753f3d06c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/xbox/nv2a.c
View File

@ -4320,12 +4320,13 @@ static void pgraph_method(NV2AState *d,
(parameter & (NV097_CLEAR_SURFACE_Z | NV097_CLEAR_SURFACE_STENCIL)); (parameter & (NV097_CLEAR_SURFACE_Z | NV097_CLEAR_SURFACE_STENCIL));
if (write_zeta) { if (write_zeta) {
uint32_t clear_zstencil = d->pgraph.regs[NV_PGRAPH_ZSTENCILCLEARVALUE]; uint32_t clear_zstencil =
d->pgraph.regs[NV_PGRAPH_ZSTENCILCLEARVALUE];
GLint gl_clear_stencil; GLint gl_clear_stencil;
GLdouble gl_clear_depth; GLdouble gl_clear_depth;
switch(pg->surface_shape.zeta_format) { switch(pg->surface_shape.zeta_format) {
case NV097_SET_SURFACE_FORMAT_ZETA_Z16: case NV097_SET_SURFACE_FORMAT_ZETA_Z16:
//FIXME: Remove bit for stencil clear? /* FIXME: Remove bit for stencil clear? */
gl_clear_depth = (clear_zstencil & 0xFFFF) / (double)0xFFFF; gl_clear_depth = (clear_zstencil & 0xFFFF) / (double)0xFFFF;
break; break;
case NV097_SET_SURFACE_FORMAT_ZETA_Z24S8: case NV097_SET_SURFACE_FORMAT_ZETA_Z24S8:
@ -4348,10 +4349,14 @@ static void pgraph_method(NV2AState *d,
} }
if (write_color) { if (write_color) {
gl_mask |= GL_COLOR_BUFFER_BIT; gl_mask |= GL_COLOR_BUFFER_BIT;
glColorMask((parameter & NV097_CLEAR_SURFACE_R)?GL_TRUE:GL_FALSE, glColorMask((parameter & NV097_CLEAR_SURFACE_R)
(parameter & NV097_CLEAR_SURFACE_G)?GL_TRUE:GL_FALSE, ? GL_TRUE : GL_FALSE,
(parameter & NV097_CLEAR_SURFACE_B)?GL_TRUE:GL_FALSE, (parameter & NV097_CLEAR_SURFACE_G)
(parameter & NV097_CLEAR_SURFACE_A)?GL_TRUE:GL_FALSE); ? 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 */
@ -4371,8 +4376,9 @@ 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*/ymin,
xmax-xmin+1, ymax-ymin+1); /* FIXME: Maybe "pg->surface_shape.clip_height-ymax" instead of ymin? */
glScissor(xmin, 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]);
@ -4381,11 +4387,6 @@ 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;