diff options
author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-08-18 19:29:49 +0200 |
---|---|---|
committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-08-23 13:53:54 +0200 |
commit | 556946f801890aaf5dbecda1f224af61f302c973 (patch) | |
tree | 939dda0e9964707686dbb564b129cece62f85689 | |
parent | 94cc01105ec70cc364d6cea3f909b0b04dcad7c1 (diff) |
util: fix valgrind errors when dumping pipe_draw_info
Various index-related fields are only initialized when required, so
they should only be dumped in those cases.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-rw-r--r-- | src/gallium/auxiliary/util/u_dump_state.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c index 70bbf5c9fad..c263021a9f6 100644 --- a/src/gallium/auxiliary/util/u_dump_state.c +++ b/src/gallium/auxiliary/util/u_dump_state.c @@ -919,9 +919,15 @@ util_dump_draw_info(FILE *stream, const struct pipe_draw_info *state) util_dump_member(stream, uint, state, max_index); util_dump_member(stream, bool, state, primitive_restart); - util_dump_member(stream, uint, state, restart_index); - - util_dump_member(stream, ptr, state, index.resource); + if (state->primitive_restart) + util_dump_member(stream, uint, state, restart_index); + + if (state->index_size) { + if (state->has_user_indices) + util_dump_member(stream, ptr, state, index.user); + else + util_dump_member(stream, ptr, state, index.resource); + } util_dump_member(stream, ptr, state, count_from_stream_output); if (!state->indirect) { |