KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Anuj Phogat 2021-04-13 21:54:48 -07:00 committed by Marge Bot
parent dde7ac7f3f
commit 12099d51f6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/broadcom/cle/v3d_decoder.c
View File

@ -674,11 +674,11 @@ v3d_spec_load(const struct v3d_device_info *devinfo)
for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) { for (int i = 0; i < ARRAY_SIZE(genxml_files_table); i++) {
if (i != 0) { if (i != 0) {
assert(genxml_files_table[i - 1].gen_10 < assert(genxml_files_table[i - 1].ver_10 <
genxml_files_table[i].gen_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_offset = genxml_files_table[i].offset;
text_length = genxml_files_table[i].length; text_length = genxml_files_table[i].length;
} }

6
src/intel/common/intel_decoder.c
View File

@ -592,10 +592,10 @@ intel_spec_load(const struct intel_device_info *devinfo)
uint8_t *text_data = NULL; uint8_t *text_data = NULL;
uint32_t text_offset = 0, text_length = 0; uint32_t text_offset = 0, text_length = 0;
ASSERTED uint32_t total_length; 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++) { 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_offset = genxml_files_table[i].offset;
text_length = genxml_files_table[i].length; text_length = genxml_files_table[i].length;
break; break;
@ -603,7 +603,7 @@ intel_spec_load(const struct intel_device_info *devinfo)
} }
if (text_length == 0) { 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; return NULL;
} }

2
src/intel/genxml/gen_zipped_file.py
View File

@ -35,7 +35,7 @@ def main():
compress = zlib.compressobj() compress = zlib.compressobj()
print("static const struct {") print("static const struct {")
print(" uint32_t gen_10;") print(" uint32_t ver_10;")
print(" uint32_t offset;") print(" uint32_t offset;")
print(" uint32_t length;") print(" uint32_t length;")
print("} genxml_files_table[] = {") print("} genxml_files_table[] = {")