From 9750ae8ca91fd089a4affe6577265e77852ad548 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Tue, 30 Sep 2014 19:25:09 +0200 Subject: [PATCH] galahad: fix indirect draw Need to unwrap the indirect resource otherwise bad things will happen. Fixes random crashes and timeouts with piglit's arb_indirect_draw tests. Reviewed-by: Jose Fonseca --- src/gallium/drivers/galahad/glhd_context.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index 79d549585b7..37ea1703fb9 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -49,7 +49,7 @@ galahad_context_destroy(struct pipe_context *_pipe) static void galahad_context_draw_vbo(struct pipe_context *_pipe, - const struct pipe_draw_info *info) + const struct pipe_draw_info *info) { struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; @@ -58,7 +58,14 @@ galahad_context_draw_vbo(struct pipe_context *_pipe, * before drawing. */ - pipe->draw_vbo(pipe, info); + if (info->indirect) { + struct pipe_draw_info info_unwrapped = *info; + info_unwrapped.indirect = galahad_resource_unwrap(info->indirect); + pipe->draw_vbo(pipe, &info_unwrapped); + } + else { + pipe->draw_vbo(pipe, info); + } } static struct pipe_query * -- 2.30.2