Mesa (master): pan/mdg: add ld_image opcodes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 45095c42ac03e94b1969e849d2f4075021594996
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=45095c42ac03e94b1969e849d2f4075021594996

Author: Italo Nicola <italonicola at collabora.com>
Date:   Fri Sep 25 21:10:54 2020 +0000

pan/mdg: add ld_image opcodes

Signed-off-by: Italo Nicola <italonicola at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8066>

---

 src/panfrost/midgard/midgard.h     | 5 +++++
 src/panfrost/midgard/midgard_ops.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h
index f3ea682ea5b..a069e729daf 100644
--- a/src/panfrost/midgard/midgard.h
+++ b/src/panfrost/midgard/midgard.h
@@ -499,6 +499,11 @@ typedef enum {
         midgard_op_ld_ubo_short4 = 0xAC,
         midgard_op_ld_ubo_int4   = 0xB0,
 
+        midgard_op_ld_image_32f = 0xB4,
+        midgard_op_ld_image_16f = 0xB5,
+        midgard_op_ld_image_32u = 0xB6,
+        midgard_op_ld_image_32i = 0xB7,
+
         /* New-style blending ops. Works on T760/T860 */
         midgard_op_ld_color_buffer_as_fp32 = 0xB8,
         midgard_op_ld_color_buffer_as_fp16 = 0xB9,
diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c
index 0c2edcf10be..d0acdd57ff6 100644
--- a/src/panfrost/midgard/midgard_ops.c
+++ b/src/panfrost/midgard/midgard_ops.c
@@ -242,6 +242,11 @@ struct mir_ldst_op_props load_store_opcode_props[256] = {
         [midgard_op_ld_ubo_short4] = {"ld_ubo_short4", M32},
         [midgard_op_ld_ubo_int4]   = {"ld_ubo_int4",   M32},
 
+        [midgard_op_ld_image_32f] = {"ld_image_32f",  M32},
+        [midgard_op_ld_image_16f] = {"ld_image_16f",  M16},
+        [midgard_op_ld_image_32i] = {"ld_image_32i", M32},
+        [midgard_op_ld_image_32u] = {"ld_image_32u", M32},
+
         [midgard_op_st_char]   = {"st_char",   M32 | LDST_STORE | LDST_ADDRESS},
         [midgard_op_st_char2]  = {"st_char2",  M16 | LDST_STORE | LDST_ADDRESS},
         [midgard_op_st_char4]  = {"st_char4",  M32 | LDST_STORE | LDST_ADDRESS},