mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-23 09:00:10 +01:00
And fix all callers to use the tallbac-based new for exec_node construction. We make ready use of talloc_parent in order to get valid, (and appropriate) talloc owners for everything we construct without having to add new 'ctx' parameters up and down all the call trees. This closes the majority of the memory leaks in the glsl-orangebook-ch06-bump.frag test: total heap usage: 55,623 allocs, 42,672 frees (was 14,533 frees) Now 76.7% leak-free. Woo-hoo!
158 lines
4.4 KiB
C++
158 lines
4.4 KiB
C++
/*
|
|
* Copyright © 2010 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
/**
|
|
* \file ir_vec_index_to_swizzle.cpp
|
|
*
|
|
* Turns constant indexing into vector types to swizzles. This will
|
|
* let other swizzle-aware optimization passes catch these constructs,
|
|
* and codegen backends not have to worry about this case.
|
|
*/
|
|
|
|
#include "ir.h"
|
|
#include "ir_visitor.h"
|
|
#include "ir_optimization.h"
|
|
#include "glsl_types.h"
|
|
|
|
/**
|
|
* Visitor class for replacing expressions with ir_constant values.
|
|
*/
|
|
|
|
class ir_vec_index_to_swizzle_visitor : public ir_hierarchical_visitor {
|
|
public:
|
|
ir_vec_index_to_swizzle_visitor()
|
|
{
|
|
progress = false;
|
|
}
|
|
|
|
ir_rvalue *convert_vec_index_to_swizzle(ir_rvalue *val);
|
|
|
|
virtual ir_visitor_status visit_enter(ir_expression *);
|
|
virtual ir_visitor_status visit_enter(ir_swizzle *);
|
|
virtual ir_visitor_status visit_enter(ir_assignment *);
|
|
virtual ir_visitor_status visit_enter(ir_return *);
|
|
virtual ir_visitor_status visit_enter(ir_call *);
|
|
virtual ir_visitor_status visit_enter(ir_if *);
|
|
|
|
bool progress;
|
|
};
|
|
|
|
ir_rvalue *
|
|
ir_vec_index_to_swizzle_visitor::convert_vec_index_to_swizzle(ir_rvalue *ir)
|
|
{
|
|
void *ctx = talloc_parent(ir);
|
|
ir_dereference_array *deref = ir->as_dereference_array();
|
|
ir_constant *ir_constant;
|
|
|
|
if (!deref)
|
|
return ir;
|
|
|
|
if (deref->array->type->is_matrix() || deref->array->type->is_array())
|
|
return ir;
|
|
|
|
assert(deref->array_index->type->base_type == GLSL_TYPE_INT);
|
|
ir_constant = deref->array_index->constant_expression_value();
|
|
if (!ir_constant)
|
|
return ir;
|
|
|
|
this->progress = true;
|
|
return new(ctx) ir_swizzle(deref->array,
|
|
ir_constant->value.i[0], 0, 0, 0, 1);
|
|
}
|
|
|
|
ir_visitor_status
|
|
ir_vec_index_to_swizzle_visitor::visit_enter(ir_expression *ir)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < ir->get_num_operands(); i++) {
|
|
ir->operands[i] = convert_vec_index_to_swizzle(ir->operands[i]);
|
|
}
|
|
|
|
return visit_continue;
|
|
}
|
|
|
|
ir_visitor_status
|
|
ir_vec_index_to_swizzle_visitor::visit_enter(ir_swizzle *ir)
|
|
{
|
|
/* Can't be hit from normal GLSL, since you can't swizzle a scalar (which
|
|
* the result of indexing a vector is. But maybe at some point we'll end up
|
|
* using swizzling of scalars for vector construction.
|
|
*/
|
|
ir->val = convert_vec_index_to_swizzle(ir->val);
|
|
|
|
return visit_continue;
|
|
}
|
|
|
|
ir_visitor_status
|
|
ir_vec_index_to_swizzle_visitor::visit_enter(ir_assignment *ir)
|
|
{
|
|
ir->lhs = convert_vec_index_to_swizzle(ir->lhs);
|
|
ir->rhs = convert_vec_index_to_swizzle(ir->rhs);
|
|
|
|
return visit_continue;
|
|
}
|
|
|
|
ir_visitor_status
|
|
ir_vec_index_to_swizzle_visitor::visit_enter(ir_call *ir)
|
|
{
|
|
foreach_iter(exec_list_iterator, iter, *ir) {
|
|
ir_rvalue *param = (ir_rvalue *)iter.get();
|
|
ir_rvalue *new_param = convert_vec_index_to_swizzle(param);
|
|
|
|
if (new_param != param) {
|
|
param->insert_before(new_param);
|
|
param->remove();
|
|
}
|
|
}
|
|
|
|
return visit_continue;
|
|
}
|
|
|
|
ir_visitor_status
|
|
ir_vec_index_to_swizzle_visitor::visit_enter(ir_return *ir)
|
|
{
|
|
if (ir->value) {
|
|
ir->value = convert_vec_index_to_swizzle(ir->value);
|
|
}
|
|
|
|
return visit_continue;
|
|
}
|
|
|
|
ir_visitor_status
|
|
ir_vec_index_to_swizzle_visitor::visit_enter(ir_if *ir)
|
|
{
|
|
ir->condition = convert_vec_index_to_swizzle(ir->condition);
|
|
|
|
return visit_continue;
|
|
}
|
|
|
|
bool
|
|
do_vec_index_to_swizzle(exec_list *instructions)
|
|
{
|
|
ir_vec_index_to_swizzle_visitor v;
|
|
|
|
v.run(instructions);
|
|
|
|
return false;
|
|
}
|