openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-23 23:41:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

microsoft/compiler: remove needless error-returns

Browse Source 
There's no root error-conditions in this code, just code that assumes
they exist and tries to handle them.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12541>
This commit is contained in:
Erik Faye-Lund 2021-08-25 11:45:13 +02:00 committed by Marge Bot
parent 46f3582c6f
commit 2c166a27fc
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/microsoft/compiler/nir_to_dxil.c
View File

@ -981,7 +981,7 @@ static unsigned get_dword_size(const struct glsl_type *type)
return glsl_get_explicit_size(type, false); return glsl_get_explicit_size(type, false);
} }
static bool static void
var_fill_const_array_with_vector_or_scalar(struct ntd_context *ctx, var_fill_const_array_with_vector_or_scalar(struct ntd_context *ctx,
const struct nir_constant *c, const struct nir_constant *c,
const struct glsl_type *type, const struct glsl_type *type,
@ -1016,11 +1016,9 @@ var_fill_const_array_with_vector_or_scalar(struct ntd_context *ctx,
offset += increment; offset += increment;
} }
return true;
} }
static bool static void
var_fill_const_array(struct ntd_context *ctx, const struct nir_constant *c, var_fill_const_array(struct ntd_context *ctx, const struct nir_constant *c,
const struct glsl_type *type, void *const_vals, const struct glsl_type *type, void *const_vals,
unsigned int offset) unsigned int offset)
@ -1028,7 +1026,7 @@ var_fill_const_array(struct ntd_context *ctx, const struct nir_constant *c,
assert(!glsl_type_is_interface(type)); assert(!glsl_type_is_interface(type));
if (glsl_type_is_vector_or_scalar(type)) { if (glsl_type_is_vector_or_scalar(type)) {
return var_fill_const_array_with_vector_or_scalar(ctx, c, type, var_fill_const_array_with_vector_or_scalar(ctx, c, type,
const_vals, const_vals,
offset); offset);
} else if (glsl_type_is_array(type)) { } else if (glsl_type_is_array(type)) {
@ -1037,27 +1035,20 @@ var_fill_const_array(struct ntd_context *ctx, const struct nir_constant *c,
unsigned stride = glsl_get_explicit_stride(without); unsigned stride = glsl_get_explicit_stride(without);
for (unsigned elt = 0; elt < glsl_get_length(type); elt++) { for (unsigned elt = 0; elt < glsl_get_length(type); elt++) {
if (!var_fill_const_array(ctx, c->elements[elt], without, var_fill_const_array(ctx, c->elements[elt], without,
const_vals, offset + (elt * stride))) { const_vals, offset + (elt * stride));
return false;
}
offset += glsl_get_cl_size(without); offset += glsl_get_cl_size(without);
} }
return true;
} else if (glsl_type_is_struct(type)) { } else if (glsl_type_is_struct(type)) {
for (unsigned int elt = 0; elt < glsl_get_length(type); elt++) { for (unsigned int elt = 0; elt < glsl_get_length(type); elt++) {
const struct glsl_type *elt_type = glsl_get_struct_field(type, elt); const struct glsl_type *elt_type = glsl_get_struct_field(type, elt);
unsigned field_offset = glsl_get_struct_field_offset(type, elt); unsigned field_offset = glsl_get_struct_field_offset(type, elt);
if (!var_fill_const_array(ctx, c->elements[elt], var_fill_const_array(ctx, c->elements[elt],
elt_type, const_vals, elt_type, const_vals,
offset + field_offset)) { offset + field_offset);
return false;
} }
} } else
return true;
}
unreachable("unknown GLSL type in var_fill_const_array"); unreachable("unknown GLSL type in var_fill_const_array");
} }
@ -1065,16 +1056,12 @@ static bool
emit_global_consts(struct ntd_context *ctx) emit_global_consts(struct ntd_context *ctx)
{ {
nir_foreach_variable_with_modes(var, ctx->shader, nir_var_shader_temp) { nir_foreach_variable_with_modes(var, ctx->shader, nir_var_shader_temp) {
bool err;
assert(var->constant_initializer); assert(var->constant_initializer);
unsigned int num_members = DIV_ROUND_UP(glsl_get_cl_size(var->type), 4); unsigned int num_members = DIV_ROUND_UP(glsl_get_cl_size(var->type), 4);
uint32_t *const_ints = ralloc_array(ctx->ralloc_ctx, uint32_t, num_members); uint32_t *const_ints = ralloc_array(ctx->ralloc_ctx, uint32_t, num_members);
err = var_fill_const_array(ctx, var->constant_initializer, var->type, var_fill_const_array(ctx, var->constant_initializer, var->type,
const_ints, 0); const_ints, 0);
if (!err)
return false;
const struct dxil_value **const_vals = const struct dxil_value **const_vals =
ralloc_array(ctx->ralloc_ctx, const struct dxil_value *, num_members); ralloc_array(ctx->ralloc_ctx, const struct dxil_value *, num_members);
if (!const_vals) if (!const_vals)