From b0452f150e7ca6099fe8833c342d834d71b5fc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Fri, 19 Mar 2021 11:33:25 +0100 Subject: [PATCH] intel/aub_viewer: fix decoding of sampler states MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's only 1 sampler state behind 3DSTATE_SAMPLER_STATE_POINTERS[_VS|_HS|_DS|_GS|_PS] and 3DSTATE_SAMPLER_STATE_POINTERS.[PointertoVSSamplerState|PointertoPSSamplerState|PointertoGSSamplerState]. Signed-off-by: Marcin Ślusarz Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/tools/aubinator_viewer_decoder.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/intel/tools/aubinator_viewer_decoder.cpp b/src/intel/tools/aubinator_viewer_decoder.cpp index b3bd7dd3562..dc10f1df235 100644 --- a/src/intel/tools/aubinator_viewer_decoder.cpp +++ b/src/intel/tools/aubinator_viewer_decoder.cpp @@ -252,9 +252,6 @@ dump_samplers(struct aub_viewer_decode_ctx *ctx, uint32_t offset, int count) { struct intel_group *strct = intel_spec_find_struct(ctx->spec, "SAMPLER_STATE"); - if (count < 0) - count = update_count(ctx, offset, strct->dw_length, 4); - uint64_t state_addr = ctx->dynamic_base + offset; struct intel_batch_decode_bo bo = ctx_get_bo(ctx, true, state_addr); const uint8_t *state_map = (const uint8_t *) bo.map; @@ -617,7 +614,7 @@ decode_3dstate_sampler_state_pointers(struct aub_viewer_decode_ctx *ctx, struct intel_group *inst, const uint32_t *p) { - dump_samplers(ctx, p[1], -1); + dump_samplers(ctx, p[1], 1); } static void @@ -625,9 +622,9 @@ decode_3dstate_sampler_state_pointers_gen6(struct aub_viewer_decode_ctx *ctx, struct intel_group *inst, const uint32_t *p) { - dump_samplers(ctx, p[1], -1); - dump_samplers(ctx, p[2], -1); - dump_samplers(ctx, p[3], -1); + dump_samplers(ctx, p[1], 1); + dump_samplers(ctx, p[2], 1); + dump_samplers(ctx, p[3], 1); } static bool