fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600: use AUTO_INDEX for draw - saves cmd buffer space

Browse source 
also seems we can use INDX_OFFSET if start != 0
This commit is contained in:
Andre Maasikas 2009-10-28 18:02:22 +02:00
parent 409469fb70
commit 5f7d5d3ea3
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mesa/drivers/dri/r600/r700_render.c
View file

@ -259,8 +259,6 @@ static void r700RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim
uint32_t vgt_index_type = 0; uint32_t vgt_index_type = 0;
uint32_t vgt_primitive_type = 0; uint32_t vgt_primitive_type = 0;
uint32_t vgt_num_indices = 0; uint32_t vgt_num_indices = 0;
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *vb = &tnl->vb;
GLboolean bUseDrawIndex; GLboolean bUseDrawIndex;
if(NULL != context->ind_buf.bo) if(NULL != context->ind_buf.bo)
@ -287,6 +285,7 @@ static void r700RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim
total_emit = 3 /* VGT_PRIMITIVE_TYPE */ total_emit = 3 /* VGT_PRIMITIVE_TYPE */
+ 2 /* VGT_INDEX_TYPE */ + 2 /* VGT_INDEX_TYPE */
+ 2 /* NUM_INSTANCES */ + 2 /* NUM_INSTANCES */
+ 3 /* VGT_INDEX_OFFSET */
+ 5 + 2; /* DRAW_INDEX */ + 5 + 2; /* DRAW_INDEX */
} }
else else
@ -294,7 +293,8 @@ static void r700RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim
total_emit = 3 /* VGT_PRIMITIVE_TYPE */ total_emit = 3 /* VGT_PRIMITIVE_TYPE */
+ 2 /* VGT_INDEX_TYPE */ + 2 /* VGT_INDEX_TYPE */
+ 2 /* NUM_INSTANCES */ + 2 /* NUM_INSTANCES */
+ num_indices + 3; /* DRAW_INDEX_IMMD */ + 3 /* VGT_INDEX_OFFSET */
+ 3; /* DRAW_INDEX_IMMD */
} }
BEGIN_BATCH_NO_AUTOSTATE(total_emit); BEGIN_BATCH_NO_AUTOSTATE(total_emit);
@ -332,13 +332,15 @@ static void r700RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim
} }
else else
{ {
SETfield(vgt_draw_initiator, DI_SRC_SEL_IMMEDIATE, SOURCE_SELECT_shift, SOURCE_SELECT_mask); SETfield(vgt_draw_initiator, DI_SRC_SEL_AUTO_INDEX, SOURCE_SELECT_shift, SOURCE_SELECT_mask);
} }
SETfield(vgt_draw_initiator, DI_MAJOR_MODE_0, MAJOR_MODE_shift, MAJOR_MODE_mask); SETfield(vgt_draw_initiator, DI_MAJOR_MODE_0, MAJOR_MODE_shift, MAJOR_MODE_mask);
if(GL_TRUE == bUseDrawIndex) if(GL_TRUE == bUseDrawIndex)
{ {
R600_OUT_BATCH_REGSEQ(VGT_INDX_OFFSET, 1);
R600_OUT_BATCH(0);
R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX, 3)); R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX, 3));
R600_OUT_BATCH(context->ind_buf.bo_offset); R600_OUT_BATCH(context->ind_buf.bo_offset);
R600_OUT_BATCH(0); R600_OUT_BATCH(0);
@ -351,21 +353,11 @@ static void r700RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim
} }
else else
{ {
R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX_IMMD, (num_indices + 1))); R600_OUT_BATCH_REGSEQ(VGT_INDX_OFFSET, 1);
R600_OUT_BATCH(start);
R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX_AUTO,1));
R600_OUT_BATCH(vgt_num_indices); R600_OUT_BATCH(vgt_num_indices);
R600_OUT_BATCH(vgt_draw_initiator); R600_OUT_BATCH(vgt_draw_initiator);
for (i = start; i < (start + num_indices); i++)
{
if(vb->Elts)
{
R600_OUT_BATCH(vb->Elts[i]);
}
else
{
R600_OUT_BATCH(i);
}
}
} }
END_BATCH(); END_BATCH();
@ -391,7 +383,7 @@ static GLuint r700PredictRenderSize(GLcontext* ctx,
else { else {
for (i = 0; i < nr_prims; ++i) for (i = 0; i < nr_prims; ++i)
{ {
dwords += prim[i].count + 10; dwords += 13;
} }
} }