summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2016-05-08 15:09:02 -0500
committerNicolai Hähnle <[email protected]>2016-05-13 01:03:38 -0500
commitca8f71f4cb4b975fb9bbdf520371a6b2c1978390 (patch)
treea718edf6accd6bf16fe4a33eb2a538ca8ff97d97
parent43ac091e4c735a50edf61972090ba83126f295e9 (diff)
r600: remove TABLE_SIZE macro
Use ARRAY_SIZE instead. Reviewed-by: Marek Olšák <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]>
-rw-r--r--src/gallium/drivers/r600/r600_isa.c4
-rw-r--r--src/gallium/drivers/r600/r600_isa.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_isa.c b/src/gallium/drivers/r600/r600_isa.c
index 044f45c7f47..2633cdcdb9f 100644
--- a/src/gallium/drivers/r600/r600_isa.c
+++ b/src/gallium/drivers/r600/r600_isa.c
@@ -568,7 +568,7 @@ int r600_isa_init(struct r600_context *ctx, struct r600_isa *isa) {
isa->alu_op2_map[opc] = i + 1;
}
- for (i = 0; i < TABLE_SIZE(fetch_op_table); ++i) {
+ for (i = 0; i < ARRAY_SIZE(fetch_op_table); ++i) {
const struct fetch_op_info *op = &fetch_op_table[i];
unsigned opc = op->opcode[isa->hw_class];
if ((op->flags & FF_GDS) || ((opc & 0xFF) != opc))
@@ -576,7 +576,7 @@ int r600_isa_init(struct r600_context *ctx, struct r600_isa *isa) {
isa->fetch_map[opc] = i + 1;
}
- for (i = 0; i < TABLE_SIZE(cf_op_table); ++i) {
+ for (i = 0; i < ARRAY_SIZE(cf_op_table); ++i) {
const struct cf_op_info *op = &cf_op_table[i];
unsigned opc = op->opcode[isa->hw_class];
if (opc == -1)
diff --git a/src/gallium/drivers/r600/r600_isa.h b/src/gallium/drivers/r600/r600_isa.h
index 1ed52edf086..b5a36b4e80e 100644
--- a/src/gallium/drivers/r600/r600_isa.h
+++ b/src/gallium/drivers/r600/r600_isa.h
@@ -675,8 +675,6 @@ struct r600_context;
int r600_isa_init(struct r600_context *ctx, struct r600_isa *isa);
int r600_isa_destroy(struct r600_isa *isa);
-#define TABLE_SIZE(t) (sizeof(t)/sizeof(t[0]))
-
extern const struct alu_op_info r600_alu_op_table[];
unsigned