qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[vulkan] Allow null extra items and symbols 

Don't want to have to pass empty lists.
This commit is contained in:
Bill Currie 2023-02-27 02:53:03 +09:00
parent b10c8dc1a1
commit acf828baa3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/video/renderer/vulkan/vkparse.c
View File

@ -2224,12 +2224,16 @@ QFV_CreateSymtab (plitem_t *dict, const char *properties,
int num_extra = 0; int num_extra = 0;
int num_syms = 0; int num_syms = 0;
if (extra_items) {
for (const char **e = extra_items; *e; e++) { for (const char **e = extra_items; *e; e++) {
if (PL_ObjectForKey (dict, *e)) { if (PL_ObjectForKey (dict, *e)) {
num_extra++; num_extra++;
} }
} }
}
if (extra_syms) {
for (exprsym_t *sym = extra_syms; sym->name; sym++, num_syms++) { } for (exprsym_t *sym = extra_syms; sym->name; sym++, num_syms++) { }
}
int total_items = num_keys + num_extra; int total_items = num_keys + num_extra;
int total_syms = total_items + num_syms; int total_syms = total_items + num_syms;
@ -2249,7 +2253,7 @@ QFV_CreateSymtab (plitem_t *dict, const char *properties,
}; };
items[i] = PL_ObjectForKey (props, symtab->symbols[i].name); items[i] = PL_ObjectForKey (props, symtab->symbols[i].name);
} }
for (int i = 0, j = 0; extra_items[i]; i++) { for (int i = 0, j = 0; num_extra && extra_items[i]; i++) {
plitem_t *val = PL_ObjectForKey (dict, extra_items[i]); plitem_t *val = PL_ObjectForKey (dict, extra_items[i]);
if (val) { if (val) {
symtab->symbols[num_keys + j] = (exprsym_t) { symtab->symbols[num_keys + j] = (exprsym_t) {