#include "ast.h"
#include "compiler/glsl_types.h"
#include "ir.h"
-#include "main/core.h" /* for MIN2 */
+#include "main/mtypes.h"
#include "main/shaderobj.h"
#include "builtin_functions.h"
exec_list *parameters,
struct _mesa_glsl_parse_state *state)
{
+ void *mem_ctx = state;
unsigned count = 0;
foreach_list_typed(ast_node, ast, link, parameters) {
ast->set_is_lhs(true);
ir_rvalue *result = ast->hir(instructions, state);
- ir_constant *const constant = result->constant_expression_value();
+ ir_constant *const constant =
+ result->constant_expression_value(mem_ctx);
+
if (constant != NULL)
result = constant;
val = ((ir_swizzle *)val)->val;
}
- while (val->ir_type == ir_type_dereference_array) {
- val = ((ir_dereference_array *)val)->array;
+ for (;;) {
+ if (val->ir_type == ir_type_dereference_array) {
+ val = ((ir_dereference_array *)val)->array;
+ } else if (val->ir_type == ir_type_dereference_record &&
+ !state->es_shader) {
+ val = ((ir_dereference_record *)val)->record;
+ } else
+ break;
}
- if (!val->as_dereference_variable() ||
- val->variable_referenced()->data.mode != ir_var_shader_in) {
+ ir_variable *var = NULL;
+ if (const ir_dereference_variable *deref_var = val->as_dereference_variable())
+ var = deref_var->variable_referenced();
+
+ if (!var || var->data.mode != ir_var_shader_in) {
_mesa_glsl_error(&loc, state,
"parameter `%s` must be a shader input",
formal->name);
return false;
}
- val->variable_referenced()->data.must_be_shader_input = 1;
+ var->data.must_be_shader_input = 1;
}
/* Verify that 'out' and 'inout' actual parameters are lvalues. */
return true;
}
+struct copy_index_deref_data {
+ void *mem_ctx;
+ exec_list *before_instructions;
+};
+
+static void
+copy_index_derefs_to_temps(ir_instruction *ir, void *data)
+{
+ struct copy_index_deref_data *d = (struct copy_index_deref_data *)data;
+
+ if (ir->ir_type == ir_type_dereference_array) {
+ ir_dereference_array *a = (ir_dereference_array *) ir;
+ ir = a->array->as_dereference();
+
+ ir_rvalue *idx = a->array_index;
+ ir_variable *var = idx->variable_referenced();
+
+ /* If the index is read only it cannot change so there is no need
+ * to copy it.
+ */
+ if (!var || var->data.read_only || var->data.memory_read_only)
+ return;
+
+ ir_variable *tmp = new(d->mem_ctx) ir_variable(idx->type, "idx_tmp",
+ ir_var_temporary);
+ d->before_instructions->push_tail(tmp);
+
+ ir_dereference_variable *const deref_tmp_1 =
+ new(d->mem_ctx) ir_dereference_variable(tmp);
+ ir_assignment *const assignment =
+ new(d->mem_ctx) ir_assignment(deref_tmp_1,
+ idx->clone(d->mem_ctx, NULL));
+ d->before_instructions->push_tail(assignment);
+
+ /* Replace the array index with a dereference of the new temporary */
+ ir_dereference_variable *const deref_tmp_2 =
+ new(d->mem_ctx) ir_dereference_variable(tmp);
+ a->array_index = deref_tmp_2;
+ }
+}
+
static void
fix_parameter(void *mem_ctx, ir_rvalue *actual, const glsl_type *formal_type,
exec_list *before_instructions, exec_list *after_instructions,
* nothing needs to be done to fix the parameter.
*/
if (formal_type == actual->type
- && (expr == NULL || expr->operation != ir_binop_vector_extract))
+ && (expr == NULL || expr->operation != ir_binop_vector_extract)
+ && actual->as_dereference_variable())
return;
+ /* An array index could also be an out variable so we need to make a copy
+ * of them before the function is called.
+ */
+ if (!actual->as_dereference_variable()) {
+ struct copy_index_deref_data data;
+ data.mem_ctx = mem_ctx;
+ data.before_instructions = before_instructions;
+
+ visit_tree(actual, copy_index_derefs_to_temps, &data);
+ }
+
/* To convert an out parameter, we need to create a temporary variable to
* hold the value before conversion, and then perform the conversion after
* the function call returns.
ir_dereference_variable *const deref_tmp_1 =
new(mem_ctx) ir_dereference_variable(tmp);
ir_assignment *const assignment =
- new(mem_ctx) ir_assignment(deref_tmp_1, actual);
+ new(mem_ctx) ir_assignment(deref_tmp_1, actual->clone(mem_ctx, NULL));
before_instructions->push_tail(assignment);
}
exec_list *actual_parameters,
ir_variable *sub_var,
ir_rvalue *array_idx,
- struct _mesa_glsl_parse_state *state,
- bool inline_immediately)
+ struct _mesa_glsl_parse_state *state)
{
void *ctx = state;
exec_list post_call_conversions;
* If the function call is a constant expression, don't generate any
* instructions; just generate an ir_constant.
*/
- if (state->is_version(120, 100)) {
- ir_constant *value = sig->constant_expression_value(actual_parameters,
+ if (state->is_version(120, 100) ||
+ state->ctx->Const.AllowGLSLBuiltinConstantExpression) {
+ ir_constant *value = sig->constant_expression_value(ctx,
+ actual_parameters,
NULL);
if (value != NULL) {
return value;
ir_call *call = new(ctx) ir_call(sig, deref,
actual_parameters, sub_var, array_idx);
instructions->push_tail(call);
- if (inline_immediately) {
+ if (sig->is_builtin()) {
+ /* inline immediately */
call->generate_inline(call);
call->remove();
}
/* Local shader has no exact candidates; check the built-ins. */
_mesa_glsl_initialize_builtin_functions();
sig = _mesa_glsl_find_builtin_function(state, name, actual_parameters);
- return sig;
+
+ /* if _mesa_glsl_find_builtin_function failed, fall back to the result
+ * of choose_best_inexact_overload() instead. This should only affect
+ * GLES.
+ */
+ return sig ? sig : local_sig;
}
static ir_function_signature *
ir_variable *sub_var = NULL;
*function_name = array->primary_expression.identifier;
- match_subroutine_by_name(*function_name, actual_parameters,
- state, &sub_var);
+ if (!match_subroutine_by_name(*function_name, actual_parameters,
+ state, &sub_var)) {
+ _mesa_glsl_error(&loc, state, "Unknown subroutine `%s'",
+ *function_name);
+ *function_name = NULL; /* indicate error condition to caller */
+ return NULL;
+ }
ir_rvalue *outer_array_idx = idx->hir(instructions, state);
return new(mem_ctx) ir_dereference_array(sub_var, outer_array_idx);
}
}
+static bool
+function_exists(_mesa_glsl_parse_state *state,
+ struct glsl_symbol_table *symbols, const char *name)
+{
+ ir_function *f = symbols->get_function(name);
+ if (f != NULL) {
+ foreach_in_list(ir_function_signature, sig, &f->signatures) {
+ if (sig->is_builtin() && !sig->is_builtin_available(state))
+ continue;
+ return true;
+ }
+ }
+ return false;
+}
+
static void
print_function_prototypes(_mesa_glsl_parse_state *state, YYLTYPE *loc,
ir_function *f)
{
gl_shader *sh = _mesa_glsl_get_builtin_function_shader();
- if (state->symbols->get_function(name) == NULL
+ if (!function_exists(state, state->symbols, name)
&& (!state->uses_builtin_functions
- || sh->symbols->get_function(name) == NULL)) {
+ || !function_exists(state, sh->symbols, name))) {
_mesa_glsl_error(loc, state, "no function with name '%s'", name);
} else {
char *str = prototype_string(NULL, name, actual_parameters);
assert(result->type == desired_type);
/* Try constant folding; it may fold in the conversion we just added. */
- ir_constant *const constant = result->constant_expression_value();
+ ir_constant *const constant = result->constant_expression_value(ctx);
return (constant != NULL) ? (ir_rvalue *) constant : (ir_rvalue *) result;
}
implicitly_convert_component(ir_rvalue * &from, const glsl_base_type to,
struct _mesa_glsl_parse_state *state)
{
+ void *mem_ctx = state;
ir_rvalue *result = from;
if (to != from->type->base_type) {
}
}
- ir_rvalue *const constant = result->constant_expression_value();
+ ir_rvalue *const constant = result->constant_expression_value(mem_ctx);
if (constant != NULL)
result = constant;
if (var->type->is_matrix()) {
ir_rvalue *lhs =
new(ctx) ir_dereference_array(var, new(ctx) ir_constant(i));
- assignment = new(ctx) ir_assignment(lhs, rhs, NULL);
+ assignment = new(ctx) ir_assignment(lhs, rhs);
} else {
/* use writemask rather than index for vector */
assert(var->type->is_vector());
ir_rvalue *lhs = new(ctx) ir_dereference_array(var,
new(ctx) ir_constant(i));
- ir_instruction *assignment = new(ctx) ir_assignment(lhs, rhs, NULL);
+ ir_instruction *assignment = new(ctx) ir_assignment(lhs, rhs);
instructions->push_tail(assignment);
i++;
/**
* Determine if a list consists of a single scalar r-value
*/
-bool
+static bool
single_scalar_parameter(exec_list *parameters)
{
const ir_rvalue *const p = (ir_rvalue *) parameters->get_head_raw();
* An \c ir_dereference_variable of the temprorary generated in the constructor
* body.
*/
-ir_rvalue *
+static ir_rvalue *
emit_inline_vector_constructor(const glsl_type *type,
exec_list *instructions,
exec_list *parameters,
* \c src_base + \c count must be less than or equal to the number of
* components in the source vector.
*/
-ir_instruction *
+static ir_instruction *
assign_to_matrix_column(ir_variable *var, unsigned column, unsigned row_base,
ir_rvalue *src, unsigned src_base, unsigned count,
void *mem_ctx)
* An \c ir_dereference_variable of the temprorary generated in the constructor
* body.
*/
-ir_rvalue *
+static ir_rvalue *
emit_inline_matrix_constructor(const glsl_type *type,
exec_list *instructions,
exec_list *parameters,
ir_instruction *inst =
new(ctx) ir_assignment(new(ctx) ir_dereference_variable(rhs_var),
- new(ctx) ir_constant(rhs_var->type, &zero),
- NULL);
+ new(ctx) ir_constant(rhs_var->type, &zero));
instructions->push_tail(inst);
ir_dereference *const rhs_ref =
ir_rvalue *const rhs = new(ctx) ir_swizzle(rhs_ref, rhs_swiz[i],
type->vector_elements);
- inst = new(ctx) ir_assignment(col_ref, rhs, NULL);
+ inst = new(ctx) ir_assignment(col_ref, rhs);
instructions->push_tail(inst);
}
ir_rvalue *const rhs = new(ctx) ir_swizzle(rhs_ref, 1, 1, 1, 1,
type->vector_elements);
- inst = new(ctx) ir_assignment(col_ref, rhs, NULL);
+ inst = new(ctx) ir_assignment(col_ref, rhs);
instructions->push_tail(inst);
}
} else if (first_param->type->is_matrix()) {
ir_rvalue *const lhs =
new(ctx) ir_dereference_array(var, new(ctx) ir_constant(col));
- ir_instruction *inst = new(ctx) ir_assignment(lhs, rhs, NULL);
+ ir_instruction *inst = new(ctx) ir_assignment(lhs, rhs);
instructions->push_tail(inst);
}
}
ir_dereference *const rhs_var_ref =
new(ctx) ir_dereference_variable(rhs_var);
ir_instruction *const inst =
- new(ctx) ir_assignment(rhs_var_ref, first_param, NULL);
+ new(ctx) ir_assignment(rhs_var_ref, first_param);
instructions->push_tail(inst);
const unsigned last_row = MIN2(src_matrix->type->vector_elements,
ir_dereference *rhs_var_ref =
new(ctx) ir_dereference_variable(rhs_var);
- ir_instruction *inst = new(ctx) ir_assignment(rhs_var_ref, rhs, NULL);
+ ir_instruction *inst = new(ctx) ir_assignment(rhs_var_ref, rhs);
instructions->push_tail(inst);
do {
}
-ir_rvalue *
+static ir_rvalue *
emit_inline_record_constructor(const glsl_type *type,
exec_list *instructions,
exec_list *parameters,
ir_rvalue *const rhs = ((ir_instruction *) node)->as_rvalue();
assert(rhs != NULL);
- ir_instruction *const assign =
- new(mem_ctx) ir_assignment(lhs, rhs, NULL);
+ ir_instruction *const assign = new(mem_ctx) ir_assignment(lhs, rhs);
instructions->push_tail(assign);
node = node->next;
* must have the exact number of arguments with matching types in the
* correct order.
*/
- if (constructor_type->is_record()) {
+ if (constructor_type->is_struct()) {
return process_record_constructor(instructions, constructor_type,
&loc, &this->expressions,
state);
instructions->push_tail(var);
instructions->push_tail(
new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),
- matrix, NULL));
- var->constant_value = matrix->constant_expression_value();
+ matrix));
+ var->constant_value = matrix->constant_expression_value(ctx);
/* Replace the matrix with dereferences of its columns. */
for (int i = 0; i < matrix->type->matrix_columns; i++) {
* After doing so, track whether or not all the parameters to the
* constructor are trivially constant valued expressions.
*/
- ir_rvalue *const constant = result->constant_expression_value();
+ ir_rvalue *const constant = result->constant_expression_value(ctx);
if (constant != NULL)
result = constant;
new(ctx) ir_dereference_variable(mvp),
new(ctx) ir_dereference_variable(vtx));
} else {
- if (state->stage == MESA_SHADER_TESS_CTRL &&
- sig->is_builtin() && strcmp(func_name, "barrier") == 0) {
+ bool is_begin_interlock = false;
+ bool is_end_interlock = false;
+ if (sig->is_builtin() &&
+ state->stage == MESA_SHADER_FRAGMENT &&
+ state->ARB_fragment_shader_interlock_enable) {
+ is_begin_interlock = strcmp(func_name, "beginInvocationInterlockARB") == 0;
+ is_end_interlock = strcmp(func_name, "endInvocationInterlockARB") == 0;
+ }
+
+ if (sig->is_builtin() &&
+ ((state->stage == MESA_SHADER_TESS_CTRL &&
+ strcmp(func_name, "barrier") == 0) ||
+ is_begin_interlock || is_end_interlock)) {
if (state->current_function == NULL ||
strcmp(state->current_function->function_name(), "main") != 0) {
_mesa_glsl_error(&loc, state,
- "barrier() may only be used in main()");
+ "%s() may only be used in main()", func_name);
}
if (state->found_return) {
_mesa_glsl_error(&loc, state,
- "barrier() may not be used after return");
+ "%s() may not be used after return", func_name);
}
if (instructions != &state->current_function->body) {
_mesa_glsl_error(&loc, state,
- "barrier() may not be used in control flow");
+ "%s() may not be used in control flow", func_name);
}
}
+ /* There can be only one begin/end interlock pair in the function. */
+ if (is_begin_interlock) {
+ if (state->found_begin_interlock)
+ _mesa_glsl_error(&loc, state,
+ "beginInvocationInterlockARB may not be used twice");
+ state->found_begin_interlock = true;
+ } else if (is_end_interlock) {
+ if (!state->found_begin_interlock)
+ _mesa_glsl_error(&loc, state,
+ "endInvocationInterlockARB may not be used "
+ "before beginInvocationInterlockARB");
+ if (state->found_end_interlock)
+ _mesa_glsl_error(&loc, state,
+ "endInvocationInterlockARB may not be used twice");
+ state->found_end_interlock = true;
+ }
+
value = generate_call(instructions, sig, &actual_parameters, sub_var,
- array_idx, state, sig->is_builtin());
+ array_idx, state);
if (!value) {
ir_variable *const tmp = new(ctx) ir_variable(glsl_type::void_type,
"void_var",
&this->expressions, state);
}
- if (constructor_type->is_record()) {
+ if (constructor_type->is_struct()) {
return process_record_constructor(instructions, constructor_type, &loc,
&this->expressions, state);
}