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

nv2a: Refactor inline buffer clear, clear on draw flush

This commit is contained in:
Matt Borgerson 2022-06-15 16:55:59 -07:00 committed by mborgerson
parent 84260dfc18
commit 12134404df
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2684,10 +2684,22 @@ DEF_METHOD_INC(NV097, SET_EYE_DIRECTION)
pg->ltctxa_dirty[NV_IGRAPH_XF_LTCTXA_EYED] = true; pg->ltctxa_dirty[NV_IGRAPH_XF_LTCTXA_EYED] = true;
} }
static void pgraph_reset_inline_buffers(PGRAPHState *pg)
{
pg->inline_elements_length = 0;
pg->inline_array_length = 0;
pg->inline_buffer_length = 0;
pg->draw_arrays_length = 0;
pg->draw_arrays_min_start = -1;
pg->draw_arrays_max_count = 0;
pg->draw_arrays_prevent_connect = false;
}
static void pgraph_flush_draw(NV2AState *d) static void pgraph_flush_draw(NV2AState *d)
{ {
PGRAPHState *pg = &d->pgraph; PGRAPHState *pg = &d->pgraph;
if (!(pg->color_binding || pg->zeta_binding)) { if (!(pg->color_binding || pg->zeta_binding)) {
pgraph_reset_inline_buffers(pg);
return; return;
} }
assert(pg->shader_binding); assert(pg->shader_binding);
@ -2791,6 +2803,8 @@ static void pgraph_flush_draw(NV2AState *d)
NV2A_GL_DPRINTF(true, "EMPTY NV097_SET_BEGIN_END"); NV2A_GL_DPRINTF(true, "EMPTY NV097_SET_BEGIN_END");
NV2A_UNCONFIRMED("EMPTY NV097_SET_BEGIN_END"); NV2A_UNCONFIRMED("EMPTY NV097_SET_BEGIN_END");
} }
pgraph_reset_inline_buffers(pg);
} }
DEF_METHOD(NV097, SET_BEGIN_END) DEF_METHOD(NV097, SET_BEGIN_END)
@ -2839,14 +2853,7 @@ DEF_METHOD(NV097, SET_BEGIN_END)
pg->primitive_mode = parameter; pg->primitive_mode = parameter;
pgraph_update_surface(d, true, true, depth_test || stencil_test); pgraph_update_surface(d, true, true, depth_test || stencil_test);
pgraph_reset_inline_buffers(pg);
pg->inline_elements_length = 0;
pg->inline_array_length = 0;
pg->inline_buffer_length = 0;
pg->draw_arrays_length = 0;
pg->draw_arrays_min_start = -1;
pg->draw_arrays_max_count = 0;
pg->draw_arrays_prevent_connect = false;
if (!(color_write || depth_test || stencil_test)) { if (!(color_write || depth_test || stencil_test)) {
// FIXME: Check PGRAPH register 0x880. // FIXME: Check PGRAPH register 0x880.
@ -3204,11 +3211,6 @@ static void pgraph_expand_draw_arrays(NV2AState *d)
pgraph_flush_draw(d); pgraph_flush_draw(d);
} }
pg->draw_arrays_length = 0;
pg->draw_arrays_min_start = -1;
pg->draw_arrays_max_count = 0;
pg->draw_arrays_prevent_connect = false;
assert((pg->inline_elements_length + count) < NV2A_MAX_BATCH_LENGTH); assert((pg->inline_elements_length + count) < NV2A_MAX_BATCH_LENGTH);
for (unsigned int i = 0; i < count; i++) { for (unsigned int i = 0; i < count; i++) {
pg->inline_elements[pg->inline_elements_length++] = start + i; pg->inline_elements[pg->inline_elements_length++] = start + i;
@ -3229,6 +3231,7 @@ DEF_METHOD_NON_INC(NV097, ARRAY_ELEMENT16)
if (pg->draw_arrays_length) { if (pg->draw_arrays_length) {
pgraph_expand_draw_arrays(d); pgraph_expand_draw_arrays(d);
} }
assert(pg->inline_elements_length < NV2A_MAX_BATCH_LENGTH); assert(pg->inline_elements_length < NV2A_MAX_BATCH_LENGTH);
pg->inline_elements[pg->inline_elements_length++] = parameter & 0xFFFF; pg->inline_elements[pg->inline_elements_length++] = parameter & 0xFFFF;
pg->inline_elements[pg->inline_elements_length++] = parameter >> 16; pg->inline_elements[pg->inline_elements_length++] = parameter >> 16;
@ -3241,6 +3244,7 @@ DEF_METHOD_NON_INC(NV097, ARRAY_ELEMENT32)
if (pg->draw_arrays_length) { if (pg->draw_arrays_length) {
pgraph_expand_draw_arrays(d); pgraph_expand_draw_arrays(d);
} }
assert(pg->inline_elements_length < NV2A_MAX_BATCH_LENGTH); assert(pg->inline_elements_length < NV2A_MAX_BATCH_LENGTH);
pg->inline_elements[pg->inline_elements_length++] = parameter; pg->inline_elements[pg->inline_elements_length++] = parameter;
} }