NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nv50: support vertex index bias

Browse source
This commit is contained in:
Christoph Bumiller 2010-04-20 21:18:15 +02:00
parent caa05ef419
commit 3c9df0bda6
2 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/gallium/drivers/nv50/nv50_push.c
View file

@ -13,6 +13,7 @@ struct push_context {
unsigned vtx_size;
void *idxbuf;
int32_t idxbias;
unsigned idxsize;
float edgeflag;
@ -143,6 +144,16 @@ emit_elt08(void *priv, unsigned start, unsigned count)
emit_vertex(ctx, idxbuf[start++]);
}
static void
emit_elt08_biased(void *priv, unsigned start, unsigned count)
{
struct push_context *ctx = priv;
uint8_t *idxbuf = ctx->idxbuf;
while (count--)
emit_vertex(ctx, idxbuf[start++] + ctx->idxbias);
}
static void
emit_elt16(void *priv, unsigned start, unsigned count)
{
@ -153,6 +164,16 @@ emit_elt16(void *priv, unsigned start, unsigned count)
emit_vertex(ctx, idxbuf[start++]);
}
static void
emit_elt16_biased(void *priv, unsigned start, unsigned count)
{
struct push_context *ctx = priv;
uint16_t *idxbuf = ctx->idxbuf;
while (count--)
emit_vertex(ctx, idxbuf[start++] + ctx->idxbias);
}
static void
emit_elt32(void *priv, unsigned start, unsigned count)
{
@ -163,6 +184,16 @@ emit_elt32(void *priv, unsigned start, unsigned count)
emit_vertex(ctx, idxbuf[start++]);
}
static void
emit_elt32_biased(void *priv, unsigned start, unsigned count)
{
struct push_context *ctx = priv;
uint32_t *idxbuf = ctx->idxbuf;
while (count--)
emit_vertex(ctx, idxbuf[start++] + ctx->idxbias);
}
static void
emit_verts(void *priv, unsigned start, unsigned count)
{
@ -269,8 +300,8 @@ nv50_push_elements_instanced(struct pipe_context *pipe,
return;
}
ctx.idxbuf = bo->map;
ctx.idxbias = idxbias;
ctx.idxsize = idxsize;
assert(idxbias == 0);
nouveau_bo_unmap(bo);
}
@ -278,12 +309,12 @@ nv50_push_elements_instanced(struct pipe_context *pipe,
s.edge = emit_edgeflag;
if (idxbuf) {
if (idxsize == 1)
s.emit = emit_elt08;
s.emit = idxbias ? emit_elt08_biased : emit_elt08;
else
if (idxsize == 2)
s.emit = emit_elt16;
s.emit = idxbias ? emit_elt16_biased : emit_elt16;
else
s.emit = emit_elt32;
s.emit = idxbias ? emit_elt32_biased : emit_elt32;
} else
s.emit = emit_verts;

9
src/gallium/drivers/nv50/nv50_vbo.c
View file

@ -401,14 +401,17 @@ nv50_draw_elements_instanced(struct pipe_context *pipe,
if (!nv50_state_validate(nv50, 13 + 16*3))
return;
assert(indexBias == 0);
if (nv50->vbo_fifo) {
nv50_push_elements_instanced(pipe, indexBuffer, indexSize,
indexBias, mode, start, count,
startInstance, instanceCount);
return;
} else
}
/* indices are uint32 internally, so large indexBias means negative */
BEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_BASE, 1);
OUT_RING (chan, indexBias);
if (!(indexBuffer->bind & PIPE_BIND_INDEX_BUFFER) || indexSize == 1) {
nv50_draw_elements_inline(pipe, indexBuffer, indexSize,
mode, start, count, startInstance,