ast_type_qualifier subroutine_only;
subroutine_only.flags.i = 0;
subroutine_only.flags.q.subroutine = 1;
- subroutine_only.flags.q.subroutine_def = 1;
if (state->has_explicit_uniform_location()) {
subroutine_only.flags.q.explicit_index = 1;
}
{
return this->flags.q.origin_upper_left
|| this->flags.q.pixel_center_integer
- || this->flags.q.depth_any
- || this->flags.q.depth_greater
- || this->flags.q.depth_less
- || this->flags.q.depth_unchanged
+ || this->flags.q.depth_type
|| this->flags.q.std140
|| this->flags.q.std430
|| this->flags.q.shared
|| this->flags.q.column_major
|| this->flags.q.row_major
|| this->flags.q.packed
+ || this->flags.q.bindless_sampler
+ || this->flags.q.bindless_image
+ || this->flags.q.bound_sampler
+ || this->flags.q.bound_image
|| this->flags.q.explicit_align
|| this->flags.q.explicit_component
|| this->flags.q.explicit_location
|| this->flags.q.write_only;
}
+bool ast_type_qualifier::is_subroutine_decl() const
+{
+ return this->flags.q.subroutine && !this->subroutine_list;
+}
+
static bool
validate_prim_type(YYLTYPE *loc,
_mesa_glsl_parse_state *state,
}
static bool
-validate_point_mode(YYLTYPE *loc,
- _mesa_glsl_parse_state *state,
- const ast_type_qualifier &qualifier,
- const ast_type_qualifier &new_qualifier)
+validate_point_mode(MAYBE_UNUSED const ast_type_qualifier &qualifier,
+ MAYBE_UNUSED const ast_type_qualifier &new_qualifier)
{
/* Point mode can only be true if the flag is set. */
assert (!qualifier.flags.q.point_mode || !new_qualifier.flags.q.point_mode
return true;
}
+static void
+merge_bindless_qualifier(_mesa_glsl_parse_state *state)
+{
+ if (state->default_uniform_qualifier->flags.q.bindless_sampler) {
+ state->bindless_sampler_specified = true;
+ state->default_uniform_qualifier->flags.q.bindless_sampler = false;
+ }
+
+ if (state->default_uniform_qualifier->flags.q.bindless_image) {
+ state->bindless_image_specified = true;
+ state->default_uniform_qualifier->flags.q.bindless_image = false;
+ }
+
+ if (state->default_uniform_qualifier->flags.q.bound_sampler) {
+ state->bound_sampler_specified = true;
+ state->default_uniform_qualifier->flags.q.bound_sampler = false;
+ }
+
+ if (state->default_uniform_qualifier->flags.q.bound_image) {
+ state->bound_image_specified = true;
+ state->default_uniform_qualifier->flags.q.bound_image = false;
+ }
+}
+
/**
- * This function merges both duplicate identifies within a single layout and
- * multiple layout qualifiers on a single variable declaration. The
- * is_single_layout_merge param is used differentiate between the two.
+ * This function merges duplicate layout identifiers.
+ *
+ * It deals with duplicates within a single layout qualifier, among multiple
+ * layout qualifiers on a single declaration and on several declarations for
+ * the same variable.
+ *
+ * The is_single_layout_merge and is_multiple_layouts_merge parameters are
+ * used to differentiate among them.
*/
bool
ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
_mesa_glsl_parse_state *state,
const ast_type_qualifier &q,
- bool is_single_layout_merge)
+ bool is_single_layout_merge,
+ bool is_multiple_layouts_merge)
{
bool r = true;
ast_type_qualifier ubo_mat_mask;
input_layout_mask.flags.q.precise = 1;
input_layout_mask.flags.q.sample = 1;
input_layout_mask.flags.q.smooth = 1;
+ input_layout_mask.flags.q.non_coherent = 1;
+
+ if (state->has_bindless()) {
+ /* Allow to use image qualifiers with shader inputs/outputs. */
+ input_layout_mask.flags.q.coherent = 1;
+ input_layout_mask.flags.q._volatile = 1;
+ input_layout_mask.flags.q.restrict_flag = 1;
+ input_layout_mask.flags.q.read_only = 1;
+ input_layout_mask.flags.q.write_only = 1;
+ input_layout_mask.flags.q.explicit_image_format = 1;
+ }
/* Uniform block layout qualifiers get to overwrite each
* other (rightmost having priority), while all other
return false;
}
+ if (is_multiple_layouts_merge && !state->has_420pack_or_es31()) {
+ _mesa_glsl_error(loc, state,
+ "duplicate layout(...) qualifiers");
+ return false;
+ }
+
if (q.flags.q.prim_type) {
r &= validate_prim_type(loc, state, *this, q);
this->flags.q.prim_type = 1;
}
if (q.flags.q.max_vertices) {
- if (this->flags.q.max_vertices && !is_single_layout_merge) {
+ if (this->flags.q.max_vertices
+ && !is_single_layout_merge && !is_multiple_layouts_merge) {
this->max_vertices->merge_qualifier(q.max_vertices);
} else {
this->flags.q.max_vertices = 1;
}
}
- if (q.flags.q.subroutine_def) {
- if (this->flags.q.subroutine_def) {
+ if (q.subroutine_list) {
+ if (this->subroutine_list) {
_mesa_glsl_error(loc, state,
"conflicting subroutine qualifiers used");
} else {
}
if (q.flags.q.invocations) {
- if (this->flags.q.invocations && !is_single_layout_merge) {
+ if (this->flags.q.invocations
+ && !is_single_layout_merge && !is_multiple_layouts_merge) {
this->invocations->merge_qualifier(q.invocations);
} else {
this->flags.q.invocations = 1;
}
}
- if (q.flags.q.explicit_xfb_stride)
+ if (q.flags.q.explicit_xfb_stride) {
+ this->flags.q.xfb_stride = 1;
+ this->flags.q.explicit_xfb_stride = 1;
this->xfb_stride = q.xfb_stride;
-
- /* Merge all we xfb_stride qualifiers into the global out */
- if (q.flags.q.explicit_xfb_stride || this->flags.q.xfb_stride) {
-
- /* Set xfb_stride flag to 0 to avoid adding duplicates every time
- * there is a merge.
- */
- this->flags.q.xfb_stride = 0;
-
- unsigned buff_idx;
- if (process_qualifier_constant(state, loc, "xfb_buffer",
- this->xfb_buffer, &buff_idx)) {
- if (state->out_qualifier->out_xfb_stride[buff_idx]
- && !is_single_layout_merge) {
- state->out_qualifier->out_xfb_stride[buff_idx]->merge_qualifier(
- new(state->linalloc) ast_layout_expression(*loc, this->xfb_stride));
- } else {
- state->out_qualifier->out_xfb_stride[buff_idx] =
- new(state->linalloc) ast_layout_expression(*loc, this->xfb_stride);
- }
- }
}
}
if (q.flags.q.vertices) {
- if (this->flags.q.vertices && !is_single_layout_merge) {
+ if (this->flags.q.vertices
+ && !is_single_layout_merge && !is_multiple_layouts_merge) {
this->vertices->merge_qualifier(q.vertices);
} else {
this->flags.q.vertices = 1;
}
if (q.flags.q.point_mode) {
- r &= validate_point_mode(loc, state, *this, q);
+ r &= validate_point_mode(*this, q);
this->flags.q.point_mode = 1;
this->point_mode = q.point_mode;
}
for (int i = 0; i < 3; i++) {
if (q.flags.q.local_size & (1 << i)) {
- if (this->local_size[i] && !is_single_layout_merge) {
+ if (this->local_size[i]
+ && !is_single_layout_merge && !is_multiple_layouts_merge) {
this->local_size[i]->merge_qualifier(q.local_size[i]);
} else {
this->local_size[i] = q.local_size[i];
if (q.flags.q.local_size_variable)
this->flags.q.local_size_variable = true;
+ if (q.flags.q.bindless_sampler)
+ this->flags.q.bindless_sampler = true;
+
+ if (q.flags.q.bindless_image)
+ this->flags.q.bindless_image = true;
+
+ if (q.flags.q.bound_sampler)
+ this->flags.q.bound_sampler = true;
+
+ if (q.flags.q.bound_image)
+ this->flags.q.bound_image = true;
+
this->flags.i |= q.flags.i;
if (this->flags.q.in &&
this->image_base_type = q.image_base_type;
}
+ if (q.flags.q.bindless_sampler ||
+ q.flags.q.bindless_image ||
+ q.flags.q.bound_sampler ||
+ q.flags.q.bound_image)
+ merge_bindless_qualifier(state);
+
return r;
}
bool
ast_type_qualifier::merge_into_out_qualifier(YYLTYPE *loc,
_mesa_glsl_parse_state *state,
- ast_node* &node, bool create_node)
+ ast_node* &node)
{
const bool r = state->out_qualifier->merge_qualifier(loc, state,
*this, false);
state->out_qualifier->flags.q.explicit_stream = 0;
break;
case MESA_SHADER_TESS_CTRL:
- if (create_node)
- node = new(state->linalloc) ast_tcs_output_layout(*loc);
+ node = new(state->linalloc) ast_tcs_output_layout(*loc);
break;
default:
break;
break;
case MESA_SHADER_FRAGMENT:
valid_in_mask.flags.q.early_fragment_tests = 1;
+ valid_in_mask.flags.q.inner_coverage = 1;
+ valid_in_mask.flags.q.post_depth_coverage = 1;
break;
case MESA_SHADER_COMPUTE:
valid_in_mask.flags.q.local_size = 7;
r &= validate_prim_type(loc, state, *state->in_qualifier, *this);
r &= validate_vertex_spacing(loc, state, *state->in_qualifier, *this);
r &= validate_ordering(loc, state, *state->in_qualifier, *this);
- r &= validate_point_mode(loc, state, *state->in_qualifier, *this);
+ r &= validate_point_mode(*state->in_qualifier, *this);
return r;
}
bool
ast_type_qualifier::merge_into_in_qualifier(YYLTYPE *loc,
_mesa_glsl_parse_state *state,
- ast_node* &node, bool create_node)
+ ast_node* &node)
{
bool r = true;
void *lin_ctx = state->linalloc;
* more repeated nodes will be created as we will have the flag set.
*/
if (state->stage == MESA_SHADER_GEOMETRY
- && this->flags.q.prim_type && !state->in_qualifier->flags.q.prim_type
- && create_node) {
+ && this->flags.q.prim_type && !state->in_qualifier->flags.q.prim_type) {
node = new(lin_ctx) ast_gs_input_layout(*loc, this->prim_type);
}
state->in_qualifier->flags.q.early_fragment_tests = false;
}
+ if (state->in_qualifier->flags.q.inner_coverage) {
+ state->fs_inner_coverage = true;
+ state->in_qualifier->flags.q.inner_coverage = false;
+ }
+
+ if (state->in_qualifier->flags.q.post_depth_coverage) {
+ state->fs_post_depth_coverage = true;
+ state->in_qualifier->flags.q.post_depth_coverage = false;
+ }
+
+ if (state->fs_inner_coverage && state->fs_post_depth_coverage) {
+ _mesa_glsl_error(loc, state,
+ "inner_coverage & post_depth_coverage layout qualifiers "
+ "are mutally exclusives");
+ r = false;
+ }
+
/* We allow the creation of multiple cs_input_layout nodes. Coherence among
* all existing nodes is checked later, when the AST node is transformed
* into HIR.
*/
if (state->in_qualifier->flags.q.local_size) {
- if (create_node)
- node = new(lin_ctx) ast_cs_input_layout(*loc, state->in_qualifier->local_size);
+ node = new(lin_ctx) ast_cs_input_layout(*loc,
+ state->in_qualifier->local_size);
state->in_qualifier->flags.q.local_size = 0;
for (int i = 0; i < 3; i++)
state->in_qualifier->local_size[i] = NULL;
return r;
}
+bool
+ast_type_qualifier::push_to_global(YYLTYPE *loc,
+ _mesa_glsl_parse_state *state)
+{
+ if (this->flags.q.xfb_stride) {
+ this->flags.q.xfb_stride = 0;
+
+ unsigned buff_idx;
+ if (process_qualifier_constant(state, loc, "xfb_buffer",
+ this->xfb_buffer, &buff_idx)) {
+ if (state->out_qualifier->out_xfb_stride[buff_idx]) {
+ state->out_qualifier->out_xfb_stride[buff_idx]->merge_qualifier(
+ new(state->linalloc) ast_layout_expression(*loc,
+ this->xfb_stride));
+ } else {
+ state->out_qualifier->out_xfb_stride[buff_idx] =
+ new(state->linalloc) ast_layout_expression(*loc,
+ this->xfb_stride);
+ }
+ }
+ }
+
+ return true;
+}
+
/**
* Check if the current type qualifier has any illegal flags.
*
bad.flags.q.explicit_index ? " index" : "",
bad.flags.q.explicit_binding ? " binding" : "",
bad.flags.q.explicit_offset ? " offset" : "",
- bad.flags.q.depth_any ? " depth_any" : "",
- bad.flags.q.depth_greater ? " depth_greater" : "",
- bad.flags.q.depth_less ? " depth_less" : "",
- bad.flags.q.depth_unchanged ? " depth_unchanged" : "",
+ bad.flags.q.depth_type ? " depth_type" : "",
bad.flags.q.std140 ? " std140" : "",
bad.flags.q.std430 ? " std430" : "",
bad.flags.q.shared ? " shared" : "",
bad.flags.q.point_mode ? " point_mode" : "",
bad.flags.q.vertices ? " vertices" : "",
bad.flags.q.subroutine ? " subroutine" : "",
- bad.flags.q.subroutine_def ? " subroutine_def" : "");
+ bad.flags.q.blend_support ? " blend_support" : "",
+ bad.flags.q.inner_coverage ? " inner_coverage" : "",
+ bad.flags.q.bindless_sampler ? " bindless_sampler" : "",
+ bad.flags.q.bindless_image ? " bindless_image" : "",
+ bad.flags.q.bound_sampler ? " bound_sampler" : "",
+ bad.flags.q.bound_image ? " bound_image" : "",
+ bad.flags.q.post_depth_coverage ? " post_depth_coverage" : "",
+ bad.flags.q.non_coherent ? " noncoherent" : "");
return false;
}
ast_layout_expression::process_qualifier_constant(struct _mesa_glsl_parse_state *state,
const char *qual_indentifier,
unsigned *value,
- bool can_be_zero,
- bool must_match)
+ bool can_be_zero)
{
int min_value = 0;
bool first_pass = true;
ir_rvalue *const ir = const_expression->hir(&dummy_instructions, state);
- ir_constant *const const_int = ir->constant_expression_value();
+ ir_constant *const const_int =
+ ir->constant_expression_value(ralloc_parent(ir));
+
if (const_int == NULL || !const_int->type->is_integer()) {
YYLTYPE loc = const_expression->get_location();
_mesa_glsl_error(&loc, state, "%s must be an integral constant "
return false;
}
- /* From section 4.4 "Layout Qualifiers" of the GLSL 4.50 spec:
- * "When the same layout-qualifier-name occurs multiple times,
- * in a single declaration, the last occurrence overrides the
- * former occurrence(s)."
- */
- if (!first_pass) {
- if ((must_match || !state->has_420pack()) && *value != const_int->value.u[0]) {
- YYLTYPE loc = const_expression->get_location();
- _mesa_glsl_error(&loc, state, "%s layout qualifier does not "
- "match previous declaration (%d vs %d)",
- qual_indentifier, *value, const_int->value.i[0]);
- return false;
- }
+ if (!first_pass && *value != const_int->value.u[0]) {
+ YYLTYPE loc = const_expression->get_location();
+ _mesa_glsl_error(&loc, state, "%s layout qualifier does not "
+ "match previous declaration (%d vs %d)",
+ qual_indentifier, *value, const_int->value.i[0]);
+ return false;
} else {
first_pass = false;
*value = const_int->value.u[0];
ir_rvalue *const ir = const_expression->hir(&dummy_instructions, state);
- ir_constant *const const_int = ir->constant_expression_value();
+ ir_constant *const const_int =
+ ir->constant_expression_value(ralloc_parent(ir));
if (const_int == NULL || !const_int->type->is_integer()) {
_mesa_glsl_error(loc, state, "%s must be an integral constant "
"expression", qual_indentifier);
projects / mesa.git / blobdiff