From b89b0a03f292d812e4b06b0260b00a56532db689 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 29 Apr 2016 16:56:35 -0700 Subject: [PATCH] i965: Make opcode_descs and gen_from_devinfo() static. The previous commit replaced direct uses of opcode_descs with calls to the wrapper function, which should be the only method of accessing opcode_descs's data. As a result gen_from_devinfo() can also be made static. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_eu.c | 4 ++-- src/mesa/drivers/dri/i965/brw_eu.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index 14b2da4c2c6..e09ab129354 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.c +++ b/src/mesa/drivers/dri/i965/brw_eu.c @@ -355,7 +355,7 @@ enum gen { #define GEN_GE(gen) (~((gen) - 1) | gen) #define GEN_LE(gen) (((gen) - 1) | gen) -const struct opcode_desc opcode_descs[128] = { +static const struct opcode_desc opcode_descs[128] = { [BRW_OPCODE_ILLEGAL] = { .name = "illegal", .nsrc = 0, .ndst = 0, .gens = GEN_ALL, }, @@ -566,7 +566,7 @@ const struct opcode_desc opcode_descs[128] = { }, }; -int +static enum gen gen_from_devinfo(const struct brw_device_info *devinfo) { switch (devinfo->gen) { diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h index a212f51b007..30bd9039011 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.h +++ b/src/mesa/drivers/dri/i965/brw_eu.h @@ -552,10 +552,6 @@ struct opcode_desc { int gens; }; -extern const struct opcode_desc opcode_descs[128]; - -int gen_from_devinfo(const struct brw_device_info *devinfo); - const struct opcode_desc * brw_opcode_desc(const struct brw_device_info *devinfo, enum opcode opcode); -- 2.30.2