From 2b4e579585de82f76ef86387f52b666b9de846e7 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 6 Aug 2019 13:46:56 -0700 Subject: [PATCH] pan/midgard: Rename ld_global_id -> ld_compute_id It's used for more general loads within a compute shader. Signed-off-by: Alyssa Rosenzweig --- src/panfrost/midgard/midgard.h | 4 ++-- src/panfrost/midgard/midgard_ops.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h index ba7d421..4f6a58e 100644 --- a/src/panfrost/midgard/midgard.h +++ b/src/panfrost/midgard/midgard.h @@ -398,8 +398,8 @@ typedef enum { midgard_op_st_cubemap_coords = 0x0E, - /* Used in OpenCL. Probably can ld other things as well */ - midgard_op_ld_global_id = 0x10, + /* Loads a global/local/group ID, depending on arguments */ + midgard_op_ld_compute_id = 0x10, /* The L/S unit can do perspective division a clock faster than the ALU * if you're lucky. Put the vec4 in r27, and call with 0x24 as the diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c index 37aa69f..172a50f 100644 --- a/src/panfrost/midgard/midgard_ops.c +++ b/src/panfrost/midgard/midgard_ops.c @@ -171,7 +171,7 @@ struct mir_op_props alu_opcode_props[256] = { const char *load_store_opcode_names[256] = { [midgard_op_st_cubemap_coords] = "st_cubemap_coords", - [midgard_op_ld_global_id] = "ld_global_id", + [midgard_op_ld_compute_id] = "ld_compute_id", [midgard_op_ldst_perspective_division_z] = "ldst_perspective_division_z", [midgard_op_ldst_perspective_division_w] = "ldst_perspective_division_w", -- 2.7.4