Attachment 42437 Details for Bug 32768 – try to use base_vtx as index offset for auto_index

[patch] try to use base_vtx as index offset for auto_index

large_count.diff (text/plain), 3.14 KB, created by Andre Maasikas on 2011-01-25 00:54:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Maasikas

Created: 2011-01-25 00:54:05 UTC

Size: 3.14 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
>index bb14a23..06d6c9b 100644
>--- a/src/mesa/drivers/dri/r600/r700_render.c
>+++ b/src/mesa/drivers/dri/r600/r700_render.c
>@@ -319,7 +319,7 @@ static void r700RunRenderPrimitiveImmediate(struct gl_context * ctx, int start,
> {
>     context_t *context = R700_CONTEXT(ctx);
>     BATCH_LOCALS(&context->radeon);
>-    int type, i;
>+    int type;
>     uint32_t num_indices, total_emit = 0;
>     uint32_t vgt_draw_initiator = 0;
>     uint32_t vgt_index_type     = 0;
>@@ -351,22 +351,7 @@ static void r700RunRenderPrimitiveImmediate(struct gl_context * ctx, int start,
>     vgt_num_indices = num_indices;
>     SETfield(vgt_draw_initiator, DI_MAJOR_MODE_0, MAJOR_MODE_shift, MAJOR_MODE_mask);
> 
>-    if (start == 0)
>-    {
>-	SETfield(vgt_draw_initiator, DI_SRC_SEL_AUTO_INDEX, SOURCE_SELECT_shift, SOURCE_SELECT_mask);
>-    }
>-    else
>-    {
>-	if (num_indices > 0xffff)
>-	{
>-		total_emit += num_indices;
>-	}
>-	else
>-	{
>-		total_emit += (num_indices + 1) / 2;
>-	}
>-	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);
> 
>     total_emit +=   3 /* VGT_PRIMITIVE_TYPE */
> 	          + 2 /* VGT_INDEX_TYPE */
>@@ -387,45 +372,13 @@ static void r700RunRenderPrimitiveImmediate(struct gl_context * ctx, int start,
>     /* offset */
>     R600_OUT_BATCH(CP_PACKET3(R600_IT_SET_CTL_CONST, 2));
>     R600_OUT_BATCH(mmSQ_VTX_BASE_VTX_LOC - ASIC_CTL_CONST_BASE_INDEX);
>-    R600_OUT_BATCH(0); //VTX_BASE_VTX_LOC
>+    R600_OUT_BATCH(start); //VTX_BASE_VTX_LOC
>     R600_OUT_BATCH(0); //VTX_START_INST_LOC
>     // draw packet
>-    if(start == 0)
>-    {
>-        R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX_AUTO, 1));
>-        R600_OUT_BATCH(vgt_num_indices);
>-        R600_OUT_BATCH(vgt_draw_initiator);
>-    }
>-    else
>-    {
>-	if (num_indices > 0xffff)
>-        {
>-	    R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX_IMMD, (num_indices + 1)));
>-	    R600_OUT_BATCH(vgt_num_indices);
>-	    R600_OUT_BATCH(vgt_draw_initiator);
>-	    for (i = start; i < (start + num_indices); i++)
>-	    {
>-		R600_OUT_BATCH(i);
>-	    }
>-	}
>-	else
>-        {
>-	    R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX_IMMD, (((num_indices + 1) / 2) + 1)));
>-	    R600_OUT_BATCH(vgt_num_indices);
>-	    R600_OUT_BATCH(vgt_draw_initiator);
>-	    for (i = start; i < (start + num_indices); i += 2)
>-	    {
>-		if ((i + 1) == (start + num_indices))
>-		{
>-		    R600_OUT_BATCH(i);
>-		}
>-		else
>-		{
>-		    R600_OUT_BATCH(((i + 1) << 16) | (i));
>-		}
>-	    }
>-	}
>-    }
>+    
>+    R600_OUT_BATCH(CP_PACKET3(R600_IT_DRAW_INDEX_AUTO, 1));
>+    R600_OUT_BATCH(vgt_num_indices);
>+    R600_OUT_BATCH(vgt_draw_initiator);
> 
>     END_BATCH();
>     COMMIT_BATCH();
>@@ -450,12 +403,7 @@ static GLuint r700PredictRenderSize(struct gl_context* ctx,
>     else {
> 	    for (i = 0; i < nr_prims; ++i)
> 	    {
>-		    if (prim[i].start == 0)
>-			    dwords += 14;
>-		    else if (prim[i].count > 0xffff)
>-			    dwords += prim[i].count + 14;
>-		    else
>-			    dwords += ((prim[i].count + 1) / 2) + 14;
>+	        dwords += 14;
> 	    }
>     }
>

Actions: View | Splinter Review

Attachments on bug 32768: 41554 | 42437 | 48270

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.