fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nouveau: support NULL-resources

Browse source 
It's legal for a buffer-object to have a NULL-resource, but let's just
skip over it, as there's nothing to do.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Karol Herbst <kherbst@redhat.com>
This commit is contained in:
Erik Faye-Lund 2019-03-06 13:28:42 +01:00
parent a11945d179
commit 04b0c6e9df
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/nouveau/nv50/nv50_push.c
View file

@ -264,10 +264,13 @@ nv50_push_vbo(struct nv50_context *nv50, const struct pipe_draw_info *info)
const struct pipe_vertex_buffer *vb = &nv50->vtxbuf[i];
const uint8_t *data;
if (unlikely(!vb->is_user_buffer))
if (unlikely(!vb->is_user_buffer)) {
if (!vb->buffer.resource)
continue;
data = nouveau_resource_map_offset(&nv50->base,
nv04_resource(vb->buffer.resource), vb->buffer_offset, NOUVEAU_BO_RD);
else
} else
data = vb->buffer.user;
if (apply_bias && likely(!(nv50->vertex->instance_bufs & (1 << i))))

6
src/gallium/drivers/nouveau/nvc0/nvc0_vbo_translate.c
View file

@ -71,9 +71,13 @@ nvc0_vertex_configure_translate(struct nvc0_context *nvc0, int32_t index_bias)
if (likely(vb->is_user_buffer))
map = (const uint8_t *)vb->buffer.user;
else
else {
if (!vb->buffer.resource)
continue;
map = nouveau_resource_map_offset(&nvc0->base,
nv04_resource(vb->buffer.resource), vb->buffer_offset, NOUVEAU_BO_RD);
}
if (index_bias && !unlikely(nvc0->vertex->instance_bufs & (1 << i)))
map += (intptr_t)index_bias * vb->stride;