summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristoph Bumiller <[email protected]>2011-01-04 16:16:52 +0100
committerChristoph Bumiller <[email protected]>2011-01-04 16:16:52 +0100
commit4884ca5f67a0138659e48700e8b2f8821400c995 (patch)
tree386cb697466f522bc5a09ba0fa4eceb7976e815f /src
parent2f08d872b212fc294d354ec34eb9184ae2c2bcc3 (diff)
nvc0: fix index size method value for u8 indices
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/nvc0/nvc0_vbo.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_vbo.c b/src/gallium/drivers/nvc0/nvc0_vbo.c
index 15a4397515c..46f67c884aa 100644
--- a/src/gallium/drivers/nvc0/nvc0_vbo.c
+++ b/src/gallium/drivers/nvc0/nvc0_vbo.c
@@ -450,7 +450,7 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
struct nouveau_channel *chan = nvc0->screen->base.channel;
void *data;
unsigned prim;
- unsigned index_size = nvc0->idxbuf.index_size;
+ const unsigned index_size = nvc0->idxbuf.index_size;
chan->flush_notify = nvc0_draw_vbo_flush_notify;
chan->user_private = nvc0;
@@ -468,12 +468,6 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
unsigned offset = nvc0->idxbuf.offset;
unsigned limit = nvc0->idxbuf.buffer->width0 - 1;
- if (index_size == 4)
- index_size = 2;
- else
- if (index_size == 2)
- index_size = 1;
-
nvc0_buffer_adjust_score(nvc0, res, 1);
while (instance_count--) {
@@ -485,7 +479,7 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
OUT_RESRCl(chan, res, offset, NOUVEAU_BO_RD);
OUT_RESRCh(chan, res, limit, NOUVEAU_BO_RD);
OUT_RESRCl(chan, res, limit, NOUVEAU_BO_RD);
- OUT_RING (chan, index_size);
+ OUT_RING (chan, index_size >> 1);
OUT_RING (chan, start);
OUT_RING (chan, count);
IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);