} while (0)
static void validate_src(nir_src *src, validate_state *state,
- unsigned bit_size, unsigned num_components);
+ unsigned bit_sizes, unsigned num_components);
static void
validate_reg_src(nir_src *src, validate_state *state,
- unsigned bit_size, unsigned num_components)
+ unsigned bit_sizes, unsigned num_components)
{
validate_assert(state, src->reg.reg != NULL);
}
if (!src->reg.reg->is_packed) {
- if (bit_size)
- validate_assert(state, src->reg.reg->bit_size == bit_size);
+ if (bit_sizes)
+ validate_assert(state, src->reg.reg->bit_size & bit_sizes);
if (num_components)
validate_assert(state, src->reg.reg->num_components == num_components);
}
static void
validate_ssa_src(nir_src *src, validate_state *state,
- unsigned bit_size, unsigned num_components)
+ unsigned bit_sizes, unsigned num_components)
{
validate_assert(state, src->ssa != NULL);
_mesa_set_add(def_state->if_uses, src);
}
- if (bit_size)
- validate_assert(state, src->ssa->bit_size == bit_size);
+ if (bit_sizes)
+ validate_assert(state, src->ssa->bit_size & bit_sizes);
if (num_components)
validate_assert(state, src->ssa->num_components == num_components);
static void
validate_src(nir_src *src, validate_state *state,
- unsigned bit_size, unsigned num_components)
+ unsigned bit_sizes, unsigned num_components)
{
if (state->instr)
validate_assert(state, src->parent_instr == state->instr);
validate_assert(state, src->parent_if == state->if_stmt);
if (src->is_ssa)
- validate_ssa_src(src, state, bit_size, num_components);
+ validate_ssa_src(src, state, bit_sizes, num_components);
else
- validate_reg_src(src, state, bit_size, num_components);
+ validate_reg_src(src, state, bit_sizes, num_components);
}
static void
static void
validate_reg_dest(nir_reg_dest *dest, validate_state *state,
- unsigned bit_size, unsigned num_components)
+ unsigned bit_sizes, unsigned num_components)
{
validate_assert(state, dest->reg != NULL);
}
if (!dest->reg->is_packed) {
- if (bit_size)
- validate_assert(state, dest->reg->bit_size == bit_size);
+ if (bit_sizes)
+ validate_assert(state, dest->reg->bit_size & bit_sizes);
if (num_components)
validate_assert(state, dest->reg->num_components == num_components);
}
static void
validate_dest(nir_dest *dest, validate_state *state,
- unsigned bit_size, unsigned num_components)
+ unsigned bit_sizes, unsigned num_components)
{
if (dest->is_ssa) {
- if (bit_size)
- validate_assert(state, dest->ssa.bit_size == bit_size);
+ if (bit_sizes)
+ validate_assert(state, dest->ssa.bit_size & bit_sizes);
if (num_components)
validate_assert(state, dest->ssa.num_components == num_components);
validate_ssa_def(&dest->ssa, state);
} else {
- validate_reg_dest(&dest->reg, state, bit_size, num_components);
+ validate_reg_dest(&dest->reg, state, bit_sizes, num_components);
}
}
switch (instr->deref_type) {
case nir_deref_type_struct:
- validate_assert(state, glsl_type_is_struct(parent->type));
+ validate_assert(state, glsl_type_is_struct_or_ifc(parent->type));
validate_assert(state,
instr->strct.index < glsl_get_length(parent->type));
validate_assert(state, instr->type ==
case nir_deref_type_array_wildcard:
if (instr->mode == nir_var_mem_ubo ||
instr->mode == nir_var_mem_ssbo ||
- instr->mode == nir_var_mem_shared) {
+ instr->mode == nir_var_mem_shared ||
+ instr->mode == nir_var_mem_global) {
/* Shared variables and UBO/SSBOs have a bit more relaxed rules
* because we need to be able to handle array derefs on vectors.
* Fortunately, nir_lower_io handles these just fine.
validate_assert(state, instr->num_components ==
glsl_get_vector_elements(src->type));
dest_bit_size = glsl_get_bit_size(src->type);
+ /* Also allow 32-bit boolean load operations */
+ if (glsl_type_is_boolean(src->type))
+ dest_bit_size |= 32;
break;
}
validate_assert(state, instr->num_components ==
glsl_get_vector_elements(dst->type));
src_bit_sizes[1] = glsl_get_bit_size(dst->type);
+ /* Also allow 32-bit boolean store operations */
+ if (glsl_type_is_boolean(dst->type))
+ src_bit_sizes[1] |= 32;
validate_assert(state, (dst->mode & (nir_var_shader_in |
nir_var_uniform)) == 0);
validate_assert(state, (nir_intrinsic_write_mask(instr) & ~((1 << instr->num_components) - 1)) == 0);
case nir_intrinsic_copy_deref: {
nir_deref_instr *dst = nir_src_as_deref(instr->src[0]);
nir_deref_instr *src = nir_src_as_deref(instr->src[1]);
- validate_assert(state, dst->type == src->type);
+ validate_assert(state, glsl_get_bare_type(dst->type) ==
+ glsl_get_bare_type(src->type));
validate_assert(state, (dst->mode & (nir_var_shader_in |
nir_var_uniform)) == 0);
break;
if (nir_intrinsic_infos[instr->intrinsic].has_dest) {
unsigned components_written = nir_intrinsic_dest_components(instr);
+ unsigned bit_sizes = nir_intrinsic_infos[instr->intrinsic].dest_bit_sizes;
validate_assert(state, components_written > 0);
+ if (dest_bit_size && bit_sizes)
+ validate_assert(state, dest_bit_size & bit_sizes);
+ else
+ dest_bit_size = dest_bit_size ? dest_bit_size : bit_sizes;
+
validate_dest(&instr->dest, state, dest_bit_size, components_written);
}
}
if (var->num_members > 0) {
const struct glsl_type *without_array = glsl_without_array(var->type);
- validate_assert(state, glsl_type_is_struct(without_array));
+ validate_assert(state, glsl_type_is_struct_or_ifc(without_array));
validate_assert(state, var->num_members == glsl_get_length(without_array));
validate_assert(state, var->members != NULL);
}