Identical fix to :
commit 70de31d0c106f58d6b7e6d5b79b8d90c1c112a3b
Author: Jason Ekstrand <jason.ekstr...@intel.com>
Date: Fri Aug 24 16:05:08 2018 -0500
intel/batch_decoder: Print blend states properly
Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
---
src/intel/tools/aubinator_viewer_decoder.cpp | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/intel/tools/aubinator_viewer_decoder.cpp
b/src/intel/tools/aubinator_viewer_decoder.cpp
index a9e78bf04a6..adf0ac1f58d 100644
--- a/src/intel/tools/aubinator_viewer_decoder.cpp
+++ b/src/intel/tools/aubinator_viewer_decoder.cpp
@@ -624,8 +624,6 @@ decode_dynamic_state_pointers(struct aub_viewer_decode_ctx
*ctx,
struct gen_group *inst, const uint32_t *p,
const char *struct_type, int count)
{
- struct gen_group *state = gen_spec_find_struct(ctx->spec, struct_type);
-
uint32_t state_offset = 0;
struct gen_field_iterator iter;
@@ -648,6 +646,22 @@ decode_dynamic_state_pointers(struct aub_viewer_decode_ctx
*ctx,
return;
}
+ struct gen_group *state = gen_spec_find_struct(ctx->spec, struct_type);
+ if (strcmp(struct_type, "BLEND_STATE") == 0) {
+ /* Blend states are different from the others because they have a header
+ * struct called BLEND_STATE which is followed by a variable number of
+ * BLEND_STATE_ENTRY structs.
+ */
+ ImGui::Text("%s", struct_type);
+ aub_viewer_print_group(ctx, state, state_addr, state_map);
+
+ state_addr += state->dw_length * 4;
+ state_map += state->dw_length * 4;
+
+ struct_type = "BLEND_STATE_ENTRY";
+ state = gen_spec_find_struct(ctx->spec, struct_type);
+ }
+
for (int i = 0; i < count; i++) {
ImGui::Text("%s %d", struct_type, i);
aub_viewer_print_group(ctx, state, state_addr, state_map);
--
2.19.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
