Commit 04b0c6e9 authored by Erik Faye-Lund 's avatar Erik Faye-Lund
Browse files

nouveau: support NULL-resources



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 's avatarErik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Karol Herbst's avatarKarol Herbst <kherbst@redhat.com>
parent a11945d1
......@@ -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))))
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment