From 59fa7c95c8ff25495f8d954aefc923b546adeb6e Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 10 Jun 2019 11:51:16 -0700 Subject: [PATCH] panfrost/midgard/disasm: Use texture op name bare This allows us to show a call to textureLod in a reasonable way. Signed-off-by: Alyssa Rosenzweig --- src/gallium/drivers/panfrost/midgard/disassemble.c | 11 ++++------- src/gallium/drivers/panfrost/midgard/midgard.h | 5 +++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/panfrost/midgard/disassemble.c b/src/gallium/drivers/panfrost/midgard/disassemble.c index 084064eb615..49e2042f7fd 100644 --- a/src/gallium/drivers/panfrost/midgard/disassemble.c +++ b/src/gallium/drivers/panfrost/midgard/disassemble.c @@ -1045,12 +1045,12 @@ print_texture_format(int format) static void print_texture_op(int format) { - /* Act like a modifier */ - printf("."); + /* Act like a bare name, like ESSL functions */ switch (format) { - DEFINE_CASE(TEXTURE_OP_NORMAL, "normal"); - DEFINE_CASE(TEXTURE_OP_TEXEL_FETCH, "texelfetch"); + DEFINE_CASE(TEXTURE_OP_NORMAL, "texture"); + DEFINE_CASE(TEXTURE_OP_LOD, "textureLod"); + DEFINE_CASE(TEXTURE_OP_TEXEL_FETCH, "texelFetch"); default: printf("op_%d", format); @@ -1065,9 +1065,6 @@ print_texture_word(uint32_t *word, unsigned tabs) { midgard_texture_word *texture = (midgard_texture_word *) word; - /* Instruction family, like ALU words have theirs */ - printf("texture"); - /* Broad category of texture operation in question */ print_texture_op(texture->op); diff --git a/src/gallium/drivers/panfrost/midgard/midgard.h b/src/gallium/drivers/panfrost/midgard/midgard.h index c8331f64a67..bc283bb3651 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard.h +++ b/src/gallium/drivers/panfrost/midgard/midgard.h @@ -493,8 +493,9 @@ midgard_load_store; #define REG_TEX_BASE 28 /* Texture opcodes... maybe? */ -#define TEXTURE_OP_NORMAL 0x11 -#define TEXTURE_OP_TEXEL_FETCH 0x14 +#define TEXTURE_OP_NORMAL 0x11 /* texture */ +#define TEXTURE_OP_LOD 0x12 /* textureLod */ +#define TEXTURE_OP_TEXEL_FETCH 0x14 /* texelFetch */ /* Texture format types, found in format */ #define TEXTURE_CUBE 0x00 -- 2.30.2