fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 05:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: make validate_intrastage_arrays() usable across files

Browse source 
This will be used in the following patch.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28690>
This commit is contained in:
Timothy Arceri 2024-04-02 15:00:21 +11:00
parent fe2e60a4d3
commit 0d8ee7534e
3 changed files with 63 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/compiler/glsl/gl_nir_link_interface_blocks.c
View file

@ -106,58 +106,6 @@ is_interface_instance(nir_variable *var)
return glsl_without_array(var->type) == var->interface_type;
}
static bool
validate_intrastage_arrays(struct gl_shader_program *prog,
nir_variable *var, nir_variable *existing,
unsigned existing_stage, bool match_precision)
{
/* Consider the types to be "the same" if both types are arrays
* of the same type and one of the arrays is implicitly sized.
* In addition, set the type of the linked variable to the
* explicitly sized array.
*/
if (glsl_type_is_array(var->type) && glsl_type_is_array(existing->type)) {
const glsl_type *no_array_var = glsl_get_array_element(var->type);
const glsl_type *no_array_existing = glsl_get_array_element(existing->type);
bool type_matches;
type_matches = (match_precision ?
no_array_var == no_array_existing :
glsl_type_compare_no_precision(no_array_var, no_array_existing));
if (type_matches &&
((glsl_get_length(var->type) == 0)|| (glsl_get_length(existing->type) == 0))) {
if (var->type->length != 0) {
if ((int)glsl_get_length(var->type) <= existing->data.max_array_access) {
linker_error(prog, "%s `%s' declared as type "
"`%s' but outermost dimension has an index"
" of `%i'\n",
gl_nir_mode_string(var),
var->name, glsl_get_type_name(var->type),
existing->data.max_array_access);
}
existing->type = var->type;
nir_shader *s = prog->_LinkedShaders[existing_stage]->Program->nir;
nir_fixup_deref_types(s);
return true;
} else if (glsl_get_length(existing->type) != 0) {
if((int)glsl_get_length(existing->type) <= var->data.max_array_access &&
!existing->data.from_ssbo_unsized_array) {
linker_error(prog, "%s `%s' declared as type "
"`%s' but outermost dimension has an index"
" of `%i'\n",
gl_nir_mode_string(var),
var->name, glsl_get_type_name(existing->type),
var->data.max_array_access);
}
return true;
}
}
}
return false;
}
/**
* Check if two interfaces match, according to intrastage interface matching
* rules. If they do, and the first interface uses an unsized array, it will
@ -217,7 +165,7 @@ intrastage_match(nir_variable *a,
*/
if (!type_match && (glsl_type_is_array(b->type) || glsl_type_is_array(a->type)) &&
(is_interface_instance(b) || is_interface_instance(a)) &&
!validate_intrastage_arrays(prog, b, a, a_stage, match_precision))
!gl_nir_validate_intrastage_arrays(prog, b, a, a_stage, match_precision))
return false;
return true;

56
src/compiler/glsl/gl_nir_linker.c
View file

@ -1508,6 +1508,62 @@ gl_nir_link_spirv(const struct gl_constants *consts,
return true;
}
bool
gl_nir_validate_intrastage_arrays(struct gl_shader_program *prog,
nir_variable *var, nir_variable *existing,
unsigned existing_stage,
bool match_precision)
{
/* Consider the types to be "the same" if both types are arrays
* of the same type and one of the arrays is implicitly sized.
* In addition, set the type of the linked variable to the
* explicitly sized array.
*/
if (glsl_type_is_array(var->type) && glsl_type_is_array(existing->type)) {
const glsl_type *no_array_var = glsl_get_array_element(var->type);
const glsl_type *no_array_existing =
glsl_get_array_element(existing->type);
bool type_matches;
type_matches = (match_precision ?
no_array_var == no_array_existing :
glsl_type_compare_no_precision(no_array_var, no_array_existing));
if (type_matches &&
((glsl_array_size(var->type) == 0) ||
(glsl_array_size(existing->type) == 0))) {
if (glsl_array_size(var->type) != 0) {
if ((int)glsl_array_size(var->type) <=
existing->data.max_array_access) {
linker_error(prog, "%s `%s' declared as type "
"`%s' but outermost dimension has an index"
" of `%i'\n",
gl_nir_mode_string(var),
var->name, glsl_get_type_name(var->type),
existing->data.max_array_access);
}
existing->type = var->type;
nir_shader *s = prog->_LinkedShaders[existing_stage]->Program->nir;
nir_fixup_deref_types(s);
return true;
} else if (glsl_array_size(existing->type) != 0) {
if((int)glsl_array_size(existing->type) <= var->data.max_array_access &&
!existing->data.from_ssbo_unsized_array) {
linker_error(prog, "%s `%s' declared as type "
"`%s' but outermost dimension has an index"
" of `%i'\n",
gl_nir_mode_string(var),
var->name, glsl_get_type_name(existing->type),
var->data.max_array_access);
}
return true;
}
}
}
return false;
}
/**
* Initializes explicit location slots to INACTIVE_UNIFORM_EXPLICIT_LOCATION
* for a variable, checks for overlaps between other uniforms using explicit

6
src/compiler/glsl/gl_nir_linker.h
View file

@ -78,6 +78,12 @@ bool gl_nir_link_varyings(const struct gl_constants *consts,
const char * gl_nir_mode_string(const nir_variable *var);
bool gl_nir_validate_intrastage_arrays(struct gl_shader_program *prog,
nir_variable *var,
nir_variable *existing,
unsigned existing_stage,
bool match_precision);
struct nir_xfb_info *
gl_to_nir_xfb_info(struct gl_transform_feedback_info *info, void *mem_ctx);