OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

microsoft/compiler: Misc fixes caught by GCC

Browse Source 
* Fix const-correctness on dxil_mdnode pointer arrays
* Fix warning for a missing scope in a case block

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7780>
This commit is contained in:
Jesse Natalie
2020-12-01 08:44:40 -08:00
committed by Marge Bot
parent 456620a6ad
commit e593329b0c
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/microsoft/compiler/dxil_dump.c
View File

@@ -649,7 +649,7 @@ dump_mdnodes(struct dxil_dumper *d, struct list_head *list)
} }
static void static void
dump_mdnode(struct dxil_dumper *d, struct dxil_mdnode *node) dump_mdnode(struct dxil_dumper *d, const struct dxil_mdnode *node)
{ {
dxil_dump_indent(d); dxil_dump_indent(d);
switch (node->type) { switch (node->type) {

2
src/microsoft/compiler/dxil_dump_decls.h
View File

@@ -50,7 +50,7 @@ dump_instrs(struct dxil_dumper *buf, struct list_head *list);
static void static void
dump_mdnodes(struct dxil_dumper *buf, struct list_head *list); dump_mdnodes(struct dxil_dumper *buf, struct list_head *list);
static void static void
dump_mdnode(struct dxil_dumper *d, struct dxil_mdnode *node); dump_mdnode(struct dxil_dumper *d, const struct dxil_mdnode *node);
static void static void
dump_named_nodes(struct dxil_dumper *d, struct list_head *list); dump_named_nodes(struct dxil_dumper *d, struct list_head *list);
static void static void

4
src/microsoft/compiler/dxil_internal.h
View File

@@ -281,7 +281,7 @@ struct dxil_mdnode {
} value; } value;
struct { struct {
struct dxil_mdnode **subnodes; const struct dxil_mdnode **subnodes;
size_t num_subnodes; size_t num_subnodes;
} node; } node;
}; };
@@ -292,7 +292,7 @@ struct dxil_mdnode {
struct dxil_named_node { struct dxil_named_node {
char *name; char *name;
struct dxil_mdnode **subnodes; const struct dxil_mdnode **subnodes;
size_t num_subnodes; size_t num_subnodes;
struct list_head head; struct list_head head;
}; };

16
src/microsoft/compiler/dxil_module.c
View File

@@ -2273,12 +2273,12 @@ dxil_get_metadata_node(struct dxil_module *m,
n = create_mdnode(m, MD_NODE); n = create_mdnode(m, MD_NODE);
if (n) { if (n) {
n->node.subnodes = ralloc_array(n, struct dxil_mdnode *, num_subnodes); void *tmp = ralloc_array(n, struct dxil_mdnode *, num_subnodes);
if (!n->node.subnodes) if (!tmp)
return NULL; return NULL;
memcpy(n->node.subnodes, subnodes, sizeof(struct dxil_mdnode *) * memcpy(tmp, subnodes, sizeof(struct dxil_mdnode *) * num_subnodes);
num_subnodes); n->node.subnodes = tmp;
n->node.num_subnodes = num_subnodes; n->node.num_subnodes = num_subnodes;
} }
return n; return n;
@@ -2354,12 +2354,12 @@ dxil_add_metadata_named_node(struct dxil_module *m, const char *name,
if (!n->name) if (!n->name)
return false; return false;
n->subnodes = ralloc_array(n, struct dxil_mdnode *, num_subnodes); void *tmp = ralloc_array(n, struct dxil_mdnode *, num_subnodes);
if (!n->subnodes) if (!tmp)
return false; return false;
memcpy(n->subnodes, subnodes, sizeof(struct dxil_mdnode *) * memcpy(tmp, subnodes, sizeof(struct dxil_mdnode *) * num_subnodes);
num_subnodes); n->subnodes = tmp;
n->num_subnodes = num_subnodes; n->num_subnodes = num_subnodes;
list_addtail(&n->head, &m->md_named_node_list); list_addtail(&n->head, &m->md_named_node_list);

9
src/microsoft/compiler/dxil_nir.c
View File

@@ -88,17 +88,18 @@ load_comps_to_vec32(nir_builder *b, unsigned src_bit_size,
vec32comps[i] = src_comps[i]; vec32comps[i] = src_comps[i];
break; break;
case 16: case 16:
case 8: case 8: {
unsigned src_offs = i * comps_per32b; unsigned src_offs = i * comps_per32b;
vec32comps[i] = nir_u2u32(b, src_comps[src_offs]); vec32comps[i] = nir_u2u32(b, src_comps[src_offs]);
for (unsigned j = 1; j < comps_per32b && src_offs + j < num_src_comps; j++) { for (unsigned j = 1; j < comps_per32b && src_offs + j < num_src_comps; j++) {
nir_ssa_def *tmp = nir_ishl(b, nir_u2u32(b, src_comps[src_offs + j]), nir_ssa_def *tmp = nir_ishl(b, nir_u2u32(b, src_comps[src_offs + j]),
nir_imm_int(b, j * src_bit_size)); nir_imm_int(b, j * src_bit_size));
vec32comps[i] = nir_ior(b, vec32comps[i], tmp); vec32comps[i] = nir_ior(b, vec32comps[i], tmp);
} }
break; break;
} }
}
} }
return nir_vec(b, vec32comps, num_vec32comps); return nir_vec(b, vec32comps, num_vec32comps);