diff options
| author | Anuj Phogat <anuj.phogat@gmail.com> | 2021-04-13 21:54:48 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-20 20:06:34 +0000 |
| commit | 12099d51f62c2b9790c07f9e28c1f625dd04ba6c (patch) | |
| tree | 8864818de9a7793aa79199960ca5a50d8b4a0d1b | |
| parent | dde7ac7f3fa48919e735c830787ea55cc39583c8 (diff) | |
intel: Rename gen_10 to ver_10
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10241>
| -rw-r--r-- | src/broadcom/cle/v3d_decoder.c | 6 | ||||
| -rw-r--r-- | src/intel/common/intel_decoder.c | 6 | ||||
| -rw-r--r-- | src/intel/genxml/gen_zipped_file.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/broadcom/cle/v3d_decoder.c b/src/broadcom/cle/v3d_decoder.c index 3644190743f..97dd8ce8423 100644 --- a/src/broadcom/cle/v3d_decoder.c +++ b/src/broadcom/cle/v3d_decoder.c @@ -674,11 +674,11 @@ v3d_spec_load(const struct v3d_device_info *devinfo) for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) { if (i != 0) { - assert(genxml_files_table[i - 1].gen_10 < - genxml_files_table[i].gen_10); + assert(genxml_files_table[i - 1].ver_10 < + genxml_files_table[i].ver_10); } - if (genxml_files_table[i].gen_10 <= devinfo->ver) { + if (genxml_files_table[i].ver_10 <= devinfo->ver) { text_offset = genxml_files_table[i].offset; text_length = genxml_files_table[i].length; } diff --git a/src/intel/common/intel_decoder.c b/src/intel/common/intel_decoder.c index bead0f502c2..a06176a84c3 100644 --- a/src/intel/common/intel_decoder.c +++ b/src/intel/common/intel_decoder.c @@ -592,10 +592,10 @@ intel_spec_load(const struct intel_device_info *devinfo) uint8_t *text_data = NULL; uint32_t text_offset = 0, text_length = 0; ASSERTED uint32_t total_length; - uint32_t gen_10 = devinfo->verx10; + uint32_t ver_10 = devinfo->verx10; for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) { - if (genxml_files_table[i].gen_10 == gen_10) { + if (genxml_files_table[i].ver_10 == ver_10) { text_offset = genxml_files_table[i].offset; text_length = genxml_files_table[i].length; break; @@ -603,7 +603,7 @@ intel_spec_load(const struct intel_device_info *devinfo) } if (text_length == 0) { - fprintf(stderr, "unable to find gen (%u) data\n", gen_10); + fprintf(stderr, "unable to find gen (%u) data\n", ver_10); return NULL; } diff --git a/src/intel/genxml/gen_zipped_file.py b/src/intel/genxml/gen_zipped_file.py index fd91f175b16..56a0dd2dbed 100644 --- a/src/intel/genxml/gen_zipped_file.py +++ b/src/intel/genxml/gen_zipped_file.py @@ -35,7 +35,7 @@ def main(): compress = zlib.compressobj() print("static const struct {") - print(" uint32_t gen_10;") + print(" uint32_t ver_10;") print(" uint32_t offset;") print(" uint32_t length;") print("} genxml_files_table[] = {") |