diff options
| author | Emil Velikov <[email protected]> | 2013-06-21 18:04:55 +0100 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-08-06 19:53:33 -0700 |
| commit | 195e995968b31dbde8c223d306b2dbf56170d1e5 (patch) | |
| tree | 4e52c3e628ad52275abad364a380f88e1e3f917f /src | |
| parent | 6f9b090719062ded2021ebfb6b79ec84cc6a244a (diff) | |
nv50: handle pure integer vertex attributes
And as a side effect fix a crash in the following piglit test:
general/attribs GL3
Signed-off-by: Emil Velikov <[email protected]>
Cc: "9.2 and 9.1" [email protected]
(cherry picked from commit 07c8f7a6f8dfe724c1ae92ec45dd04532b6fd453)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_vbo.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_vbo.c | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv30/nv30_vbo.c b/src/gallium/drivers/nv30/nv30_vbo.c index 9033fa5a87f..9f00c0285e2 100644 --- a/src/gallium/drivers/nv30/nv30_vbo.c +++ b/src/gallium/drivers/nv30/nv30_vbo.c @@ -40,13 +40,15 @@ nv30_emit_vtxattr(struct nv30_context *nv30, struct pipe_vertex_buffer *vb, const unsigned nc = util_format_get_nr_components(ve->src_format); struct nouveau_pushbuf *push = nv30->base.pushbuf; struct nv04_resource *res = nv04_resource(vb->buffer); + const struct util_format_description *desc = + util_format_description(ve->src_format); const void *data; float v[4]; data = nouveau_resource_map_offset(&nv30->base, res, vb->buffer_offset + ve->src_offset, NOUVEAU_BO_RD); - util_format_read_4f(ve->src_format, v, 0, data, 0, 0, 0, 1, 1); + desc->unpack_rgba_float(v, 0, data, 0, 1, 1); switch (nc) { case 4: diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c index db4e0cd3346..ca46f6c2661 100644 --- a/src/gallium/drivers/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nv50/nv50_vbo.c @@ -140,10 +140,20 @@ nv50_emit_vtxattr(struct nv50_context *nv50, struct pipe_vertex_buffer *vb, const void *data = (const uint8_t *)vb->user_buffer + ve->src_offset; float v[4]; const unsigned nc = util_format_get_nr_components(ve->src_format); + const struct util_format_description *desc = + util_format_description(ve->src_format); assert(vb->user_buffer); - util_format_read_4f(ve->src_format, v, 0, data, 0, 0, 0, 1, 1); + if (desc->channel[0].pure_integer) { + if (desc->channel[0].type == UTIL_FORMAT_TYPE_SIGNED) { + desc->unpack_rgba_sint((int32_t *)v, 0, data, 0, 1, 1); + } else { + desc->unpack_rgba_uint((uint32_t *)v, 0, data, 0, 1, 1); + } + } else { + desc->unpack_rgba_float(v, 0, data, 0, 1, 1); + } switch (nc) { case 4: |