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 <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c
index 14b2da4c2c6910b3ea42e6892ad375b01c501302..e09ab129354b0fdeb69673385235302a4dc06ad5 100644 (file)
--- 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 a212f51b007b07089e403e142b162fc49bfe3db7..30bd9039011726cceaec26f99497061de82c776f 100644 (file)
--- 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);