From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 27 Dec 2017 16:40:30 +0000 (-0800)
Subject: intel/aubinator: Gracefully handle dynamic state not being available
X-Git-Tag: android-x86-8.1-r1~6893
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=69fa3fb77f298f717be9a45b3989d039071ffe15;p=android-x86%2Fexternal-mesa.git

intel/aubinator: Gracefully handle dynamic state not being available

Some older versions of the Vulkan driver didn't properly tag dynamic
state as needing to be captured.  Also, this prevents crashes when
looking at dumps on older kernels.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/intel/tools/gen_batch_decoder.c b/src/intel/tools/gen_batch_decoder.c
index e8dd19b33e0..f09b8331f84 100644
--- a/src/intel/tools/gen_batch_decoder.c
+++ b/src/intel/tools/gen_batch_decoder.c
@@ -582,6 +582,11 @@ decode_dynamic_state_pointers(struct gen_batch_decode_ctx *ctx,
                               const char *struct_type, const uint32_t *p,
                               int count)
 {
+   if (ctx->dynamic_base.map == NULL) {
+      fprintf(ctx->fp, "  dynamic %s state unavailable\n", struct_type);
+      return;
+   }
+
    struct gen_group *inst = gen_spec_find_instruction(ctx->spec, p);
    struct gen_group *state = gen_spec_find_struct(ctx->spec, struct_type);