Mesa (master): trace: fix a segfault when tracing indirect draw calls

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: 429371f22acb16862f0df7592d4c085d4a10c767
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=429371f22acb16862f0df7592d4c085d4a10c767

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Sun Jan 24 17:50:46 2016 +0100

trace: fix a segfault when tracing indirect draw calls

Like other resources, the indirect draw buffer must be unwrapped.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/trace/tr_context.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index b5ab924..6e703f7 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -119,7 +119,22 @@ trace_context_draw_vbo(struct pipe_context *_pipe,
 
    trace_dump_trace_flush();
 
-   pipe->draw_vbo(pipe, info);
+   if (info->indirect) {
+      struct pipe_draw_info *_info = NULL;
+
+      _info = MALLOC(sizeof(*_info));
+      if (!_info)
+         return;
+
+      memcpy(_info, info, sizeof(*_info));
+      _info->indirect = trace_resource_unwrap(tr_ctx, _info->indirect);
+      _info->indirect_params = trace_resource_unwrap(tr_ctx,
+                                                     _info->indirect_params);
+      pipe->draw_vbo(pipe, _info);
+      FREE(_info);
+   } else {
+      pipe->draw_vbo(pipe, info);
+   }
 
    trace_dump_call_end();
 }