*/
#include <string.h>
+#include "main/compiler.h"
#include "ir.h"
#include "glsl_types.h"
-extern "C" {
-#include "hash_table.h"
+#include "program/hash_table.h"
+
+ir_rvalue *
+ir_rvalue::clone(void *mem_ctx, struct hash_table *ht) const
+{
+ /* The only possible instantiation is the generic error value. */
+ return error_value(mem_ctx);
}
/**
* Duplicate an IR variable
- *
- * \note
- * This will probably be made \c virtual and moved to the base class
- * eventually.
*/
ir_variable *
-ir_variable::clone(struct hash_table *ht) const
+ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- ir_variable *var = new(ctx) ir_variable(this->type, this->name,
- (ir_variable_mode) this->mode);
-
- var->max_array_access = this->max_array_access;
- var->read_only = this->read_only;
- var->centroid = this->centroid;
- var->invariant = this->invariant;
- var->shader_in = this->shader_in;
- var->shader_out = this->shader_out;
- var->interpolation = this->interpolation;
- var->array_lvalue = this->array_lvalue;
- var->location = this->location;
+ ir_variable *var = new(mem_ctx) ir_variable(this->type, this->name,
+ (ir_variable_mode) this->data.mode);
+
+ var->data.max_array_access = this->data.max_array_access;
+ if (this->is_interface_instance()) {
+ var->max_ifc_array_access =
+ rzalloc_array(var, unsigned, this->interface_type->length);
+ memcpy(var->max_ifc_array_access, this->max_ifc_array_access,
+ this->interface_type->length * sizeof(unsigned));
+ }
+
+ memcpy(&var->data, &this->data, sizeof(var->data));
+
var->warn_extension = this->warn_extension;
+ var->num_state_slots = this->num_state_slots;
+ if (this->state_slots) {
+ /* FINISHME: This really wants to use something like talloc_reference, but
+ * FINISHME: ralloc doesn't have any similar function.
+ */
+ var->state_slots = ralloc_array(var, ir_state_slot,
+ this->num_state_slots);
+ memcpy(var->state_slots, this->state_slots,
+ sizeof(this->state_slots[0]) * var->num_state_slots);
+ }
+
if (this->constant_value)
- var->constant_value = this->constant_value->clone(ht);
+ var->constant_value = this->constant_value->clone(mem_ctx, ht);
+
+ if (this->constant_initializer)
+ var->constant_initializer =
+ this->constant_initializer->clone(mem_ctx, ht);
+
+ var->interface_type = this->interface_type;
if (ht) {
hash_table_insert(ht, var, (void *)const_cast<ir_variable *>(this));
}
ir_swizzle *
-ir_swizzle::clone(struct hash_table *ht) const
+ir_swizzle::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- return new(ctx) ir_swizzle(this->val->clone(ht), this->mask);
+ return new(mem_ctx) ir_swizzle(this->val->clone(mem_ctx, ht), this->mask);
}
ir_return *
-ir_return::clone(struct hash_table *ht) const
+ir_return::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
ir_rvalue *new_value = NULL;
if (this->value)
- new_value = this->value->clone(ht);
+ new_value = this->value->clone(mem_ctx, ht);
- return new(ctx) ir_return(new_value);
+ return new(mem_ctx) ir_return(new_value);
}
ir_discard *
-ir_discard::clone(struct hash_table *ht) const
+ir_discard::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
ir_rvalue *new_condition = NULL;
if (this->condition != NULL)
- new_condition = this->condition->clone(ht);
+ new_condition = this->condition->clone(mem_ctx, ht);
- return new(ctx) ir_discard(new_condition);
+ return new(mem_ctx) ir_discard(new_condition);
}
ir_loop_jump *
-ir_loop_jump::clone(struct hash_table *ht) const
+ir_loop_jump::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
(void)ht;
- return new(ctx) ir_loop_jump(this->mode);
+ return new(mem_ctx) ir_loop_jump(this->mode);
}
ir_if *
-ir_if::clone(struct hash_table *ht) const
+ir_if::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- ir_if *new_if = new(ctx) ir_if(this->condition->clone(ht));
+ ir_if *new_if = new(mem_ctx) ir_if(this->condition->clone(mem_ctx, ht));
- foreach_iter(exec_list_iterator, iter, this->then_instructions) {
- ir_instruction *ir = (ir_instruction *)iter.get();
- new_if->then_instructions.push_tail(ir->clone(ht));
+ foreach_list(n, &this->then_instructions) {
+ ir_instruction *ir = (ir_instruction *) n;
+ new_if->then_instructions.push_tail(ir->clone(mem_ctx, ht));
}
- foreach_iter(exec_list_iterator, iter, this->else_instructions) {
- ir_instruction *ir = (ir_instruction *)iter.get();
- new_if->else_instructions.push_tail(ir->clone(ht));
+ foreach_list(n, &this->else_instructions) {
+ ir_instruction *ir = (ir_instruction *) n;
+ new_if->else_instructions.push_tail(ir->clone(mem_ctx, ht));
}
return new_if;
}
ir_loop *
-ir_loop::clone(struct hash_table *ht) const
+ir_loop::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- ir_loop *new_loop = new(ctx) ir_loop();
-
- if (this->from)
- new_loop->from = this->from->clone(ht);
- if (this->to)
- new_loop->to = this->to->clone(ht);
- if (this->increment)
- new_loop->increment = this->increment->clone(ht);
- new_loop->counter = counter;
-
- foreach_iter(exec_list_iterator, iter, this->body_instructions) {
- ir_instruction *ir = (ir_instruction *)iter.get();
- new_loop->body_instructions.push_tail(ir->clone(ht));
+ ir_loop *new_loop = new(mem_ctx) ir_loop();
+
+ foreach_list(n, &this->body_instructions) {
+ ir_instruction *ir = (ir_instruction *) n;
+ new_loop->body_instructions.push_tail(ir->clone(mem_ctx, ht));
}
return new_loop;
}
ir_call *
-ir_call::clone(struct hash_table *ht) const
+ir_call::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
+ ir_dereference_variable *new_return_ref = NULL;
+ if (this->return_deref != NULL)
+ new_return_ref = this->return_deref->clone(mem_ctx, ht);
+
exec_list new_parameters;
- foreach_iter(exec_list_iterator, iter, this->actual_parameters) {
- ir_instruction *ir = (ir_instruction *)iter.get();
- new_parameters.push_tail(ir->clone(ht));
+ foreach_list(n, &this->actual_parameters) {
+ ir_instruction *ir = (ir_instruction *) n;
+ new_parameters.push_tail(ir->clone(mem_ctx, ht));
}
- return new(ctx) ir_call(this->callee, &new_parameters);
+ return new(mem_ctx) ir_call(this->callee, new_return_ref, &new_parameters);
}
ir_expression *
-ir_expression::clone(struct hash_table *ht) const
+ir_expression::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- ir_rvalue *op[2] = {NULL, NULL};
+ ir_rvalue *op[Elements(this->operands)] = { NULL, };
unsigned int i;
for (i = 0; i < get_num_operands(); i++) {
- op[i] = this->operands[i]->clone(ht);
+ op[i] = this->operands[i]->clone(mem_ctx, ht);
}
- return new(ctx) ir_expression(this->operation, this->type, op[0], op[1]);
+ return new(mem_ctx) ir_expression(this->operation, this->type,
+ op[0], op[1], op[2], op[3]);
}
ir_dereference_variable *
-ir_dereference_variable::clone(struct hash_table *ht) const
+ir_dereference_variable::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
ir_variable *new_var;
if (ht) {
new_var = this->var;
}
- return new(ctx) ir_dereference_variable(new_var);
+ return new(mem_ctx) ir_dereference_variable(new_var);
}
ir_dereference_array *
-ir_dereference_array::clone(struct hash_table *ht) const
+ir_dereference_array::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- return new(ctx) ir_dereference_array(this->array->clone(ht),
- this->array_index->clone(ht));
+ return new(mem_ctx) ir_dereference_array(this->array->clone(mem_ctx, ht),
+ this->array_index->clone(mem_ctx,
+ ht));
}
ir_dereference_record *
-ir_dereference_record::clone(struct hash_table *ht) const
+ir_dereference_record::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- return new(ctx) ir_dereference_record(this->record->clone(ht),
- this->field);
+ return new(mem_ctx) ir_dereference_record(this->record->clone(mem_ctx, ht),
+ this->field);
}
ir_texture *
-ir_texture::clone(struct hash_table *ht) const
+ir_texture::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
- ir_texture *new_tex = new(ctx) ir_texture(this->op);
+ ir_texture *new_tex = new(mem_ctx) ir_texture(this->op);
+ new_tex->type = this->type;
- new_tex->sampler = this->sampler->clone(ht);
- new_tex->coordinate = this->coordinate->clone(ht);
+ new_tex->sampler = this->sampler->clone(mem_ctx, ht);
+ if (this->coordinate)
+ new_tex->coordinate = this->coordinate->clone(mem_ctx, ht);
if (this->projector)
- new_tex->projector = this->projector->clone(ht);
+ new_tex->projector = this->projector->clone(mem_ctx, ht);
if (this->shadow_comparitor) {
- new_tex->shadow_comparitor = this->shadow_comparitor->clone(ht);
+ new_tex->shadow_comparitor = this->shadow_comparitor->clone(mem_ctx, ht);
}
- for (int i = 0; i < 3; i++)
- new_tex->offsets[i] = this->offsets[i];
+ if (this->offset != NULL)
+ new_tex->offset = this->offset->clone(mem_ctx, ht);
switch (this->op) {
case ir_tex:
+ case ir_lod:
+ case ir_query_levels:
break;
case ir_txb:
- new_tex->lod_info.bias = this->lod_info.bias->clone(ht);
+ new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht);
break;
case ir_txl:
case ir_txf:
- new_tex->lod_info.lod = this->lod_info.lod->clone(ht);
+ case ir_txs:
+ new_tex->lod_info.lod = this->lod_info.lod->clone(mem_ctx, ht);
+ break;
+ case ir_txf_ms:
+ new_tex->lod_info.sample_index = this->lod_info.sample_index->clone(mem_ctx, ht);
break;
case ir_txd:
- new_tex->lod_info.grad.dPdx = this->lod_info.grad.dPdx->clone(ht);
- new_tex->lod_info.grad.dPdy = this->lod_info.grad.dPdy->clone(ht);
+ new_tex->lod_info.grad.dPdx = this->lod_info.grad.dPdx->clone(mem_ctx, ht);
+ new_tex->lod_info.grad.dPdy = this->lod_info.grad.dPdy->clone(mem_ctx, ht);
+ break;
+ case ir_tg4:
+ new_tex->lod_info.component = this->lod_info.component->clone(mem_ctx, ht);
break;
}
}
ir_assignment *
-ir_assignment::clone(struct hash_table *ht) const
+ir_assignment::clone(void *mem_ctx, struct hash_table *ht) const
{
ir_rvalue *new_condition = NULL;
if (this->condition)
- new_condition = this->condition->clone(ht);
+ new_condition = this->condition->clone(mem_ctx, ht);
- void *ctx = talloc_parent(this);
- return new(ctx) ir_assignment(this->lhs->clone(ht),
- this->rhs->clone(ht),
- new_condition);
+ return new(mem_ctx) ir_assignment(this->lhs->clone(mem_ctx, ht),
+ this->rhs->clone(mem_ctx, ht),
+ new_condition,
+ this->write_mask);
}
ir_function *
-ir_function::clone(struct hash_table *ht) const
+ir_function::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *mem_ctx = talloc_parent(this);
ir_function *copy = new(mem_ctx) ir_function(this->name);
foreach_list_const(node, &this->signatures) {
const ir_function_signature *const sig =
(const ir_function_signature *const) node;
- ir_function_signature *sig_copy = sig->clone(ht);
+ ir_function_signature *sig_copy = sig->clone(mem_ctx, ht);
copy->add_signature(sig_copy);
if (ht != NULL)
}
ir_function_signature *
-ir_function_signature::clone(struct hash_table *ht) const
+ir_function_signature::clone(void *mem_ctx, struct hash_table *ht) const
+{
+ ir_function_signature *copy = this->clone_prototype(mem_ctx, ht);
+
+ copy->is_defined = this->is_defined;
+
+ /* Clone the instruction list.
+ */
+ foreach_list_const(node, &this->body) {
+ const ir_instruction *const inst = (const ir_instruction *) node;
+
+ ir_instruction *const inst_copy = inst->clone(mem_ctx, ht);
+ copy->body.push_tail(inst_copy);
+ }
+
+ return copy;
+}
+
+ir_function_signature *
+ir_function_signature::clone_prototype(void *mem_ctx, struct hash_table *ht) const
{
- void *mem_ctx = talloc_parent(this);
ir_function_signature *copy =
new(mem_ctx) ir_function_signature(this->return_type);
- copy->is_defined = this->is_defined;
- copy->is_built_in = this->is_built_in;
+ copy->is_defined = false;
+ copy->builtin_avail = this->builtin_avail;
+ copy->origin = this;
- /* Clone the parameter list.
+ /* Clone the parameter list, but NOT the body.
*/
foreach_list_const(node, &this->parameters) {
const ir_variable *const param = (const ir_variable *) node;
assert(const_cast<ir_variable *>(param)->as_variable() != NULL);
- ir_variable *const param_copy = param->clone(ht);
+ ir_variable *const param_copy = param->clone(mem_ctx, ht);
copy->parameters.push_tail(param_copy);
}
- /* Clone the instruction list.
- */
- foreach_list_const(node, &this->body) {
- const ir_instruction *const inst = (const ir_instruction *) node;
-
- ir_instruction *const inst_copy = inst->clone(ht);
- copy->body.push_tail(inst_copy);
- }
-
return copy;
}
ir_constant *
-ir_constant::clone(struct hash_table *ht) const
+ir_constant::clone(void *mem_ctx, struct hash_table *ht) const
{
- void *ctx = talloc_parent(this);
(void)ht;
switch (this->type->base_type) {
case GLSL_TYPE_INT:
case GLSL_TYPE_FLOAT:
case GLSL_TYPE_BOOL:
- return new(ctx) ir_constant(this->type, &this->value);
+ return new(mem_ctx) ir_constant(this->type, &this->value);
case GLSL_TYPE_STRUCT: {
- ir_constant *c = new(ctx) ir_constant;
+ ir_constant *c = new(mem_ctx) ir_constant;
c->type = this->type;
for (exec_node *node = this->components.head
- ; !node->is_tail_sentinal()
+ ; !node->is_tail_sentinel()
; node = node->next) {
ir_constant *const orig = (ir_constant *) node;
- c->components.push_tail(orig->clone(NULL));
+ c->components.push_tail(orig->clone(mem_ctx, NULL));
}
return c;
}
- default:
- assert(!"Should not get here."); break;
- return NULL;
+ case GLSL_TYPE_ARRAY: {
+ ir_constant *c = new(mem_ctx) ir_constant;
+
+ c->type = this->type;
+ c->array_elements = ralloc_array(c, ir_constant *, this->type->length);
+ for (unsigned i = 0; i < this->type->length; i++) {
+ c->array_elements[i] = this->array_elements[i]->clone(mem_ctx, NULL);
+ }
+ return c;
+ }
+
+ case GLSL_TYPE_SAMPLER:
+ case GLSL_TYPE_ATOMIC_UINT:
+ case GLSL_TYPE_VOID:
+ case GLSL_TYPE_ERROR:
+ case GLSL_TYPE_INTERFACE:
+ assert(!"Should not get here.");
+ break;
}
+
+ return NULL;
}
* table. If it is found, replace it with the value from the table.
*/
ir_function_signature *sig =
- (ir_function_signature *) hash_table_find(this->ht, ir->get_callee());
+ (ir_function_signature *) hash_table_find(this->ht, ir->callee);
if (sig != NULL)
- ir->set_callee(sig);
+ ir->callee = sig;
/* Since this may be used before function call parameters are flattened,
* the children also need to be processed.
void
-clone_ir_list(exec_list *out, const exec_list *in)
+clone_ir_list(void *mem_ctx, exec_list *out, const exec_list *in)
{
struct hash_table *ht =
hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);
foreach_list_const(node, in) {
const ir_instruction *const original = (ir_instruction *) node;
- ir_instruction *copy = original->clone(ht);
+ ir_instruction *copy = original->clone(mem_ctx, ht);
out->push_tail(copy);
}
projects / mesa.git / blobdiff