diff options
| author | Alyssa Rosenzweig <[email protected]> | 2019-06-10 13:09:39 -0700 |
|---|---|---|
| committer | Alyssa Rosenzweig <[email protected]> | 2019-06-11 08:44:19 -0700 |
| commit | cda9f3290963c65408c94bc0c859bef305f557ce (patch) | |
| tree | 874b194536e6484ec95f742e01791d8a3caf7a94 | |
| parent | 445a7b523fb6f87ef263274a0e5b2a49299aece1 (diff) | |
panfrost/midgard: Identify the in_reg_full field
This is clear for texelFetch, hence the confusion with Bifrost's filter
field, but it's much more general in reality.
Signed-off-by: Alyssa Rosenzweig <[email protected]>
| -rw-r--r-- | src/gallium/drivers/panfrost/midgard/disassemble.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/midgard/midgard.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/panfrost/midgard/midgard_compile.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/gallium/drivers/panfrost/midgard/disassemble.c b/src/gallium/drivers/panfrost/midgard/disassemble.c index d1bc6ad0e3a..fafa2d4e74a 100644 --- a/src/gallium/drivers/panfrost/midgard/disassemble.c +++ b/src/gallium/drivers/panfrost/midgard/disassemble.c @@ -1079,9 +1079,6 @@ print_texture_word(uint32_t *word, unsigned tabs) /* Instruction "modifiers" parallel the ALU instructions. */ - if (!texture->filter) - printf(".raw"); - if (texture->shadow) printf(".shadow"); @@ -1103,7 +1100,7 @@ print_texture_word(uint32_t *word, unsigned tabs) print_swizzle_vec4(texture->swizzle, false, false); printf(", "); - print_texture_reg(/*texture->in_reg_full*/true, texture->in_reg_select, texture->in_reg_upper); + print_texture_reg(texture->in_reg_full, texture->in_reg_select, texture->in_reg_upper); print_swizzle_vec4(texture->in_reg_swizzle, false, false); /* There is *always* an offset attached. Of diff --git a/src/gallium/drivers/panfrost/midgard/midgard.h b/src/gallium/drivers/panfrost/midgard/midgard.h index 9957ac5e415..841f6e5241b 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard.h +++ b/src/gallium/drivers/panfrost/midgard/midgard.h @@ -534,9 +534,7 @@ __attribute__((__packed__)) * specificed in offset_imm_* */ unsigned offset_register : 1; - /* Like in Bifrost */ - unsigned filter : 1; - + unsigned in_reg_full : 1; unsigned in_reg_select : 1; unsigned in_reg_upper : 1; unsigned in_reg_swizzle : 8; diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c index e7c093e9a29..651cdd61a5b 100644 --- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c +++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c @@ -1377,12 +1377,10 @@ emit_tex(compiler_context *ctx, nir_tex_instr *instr) .mask = 0xF, /* TODO: half */ - //.in_reg_full = 1, + .in_reg_full = 1, .in_reg_swizzle = SWIZZLE_XYZW, .out_full = 1, - .filter = 1, - /* Always 1 */ .unknown7 = 1, |