From a11945d179b2779b24f9727b55e0a70f003f359d Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 6 Mar 2019 13:28:24 +0100 Subject: [PATCH] i915: 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 --- src/gallium/drivers/i915/i915_context.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/i915/i915_context.c b/src/gallium/drivers/i915/i915_context.c index 8ea944003f2..f5116b80043 100644 --- a/src/gallium/drivers/i915/i915_context.c +++ b/src/gallium/drivers/i915/i915_context.c @@ -75,8 +75,11 @@ i915_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) for (i = 0; i < i915->nr_vertex_buffers; i++) { const void *buf = i915->vertex_buffers[i].is_user_buffer ? i915->vertex_buffers[i].buffer.user : NULL; - if (!buf) - buf = i915_buffer(i915->vertex_buffers[i].buffer.resource)->data; + if (!buf) { + if (!i915->vertex_buffers[i].buffer.resource) + continue; + buf = i915_buffer(i915->vertex_buffers[i].buffer.resource)->data; + } draw_set_mapped_vertex_buffer(draw, i, buf, ~0); } -- 2.11.0