Mesa (7.9): Convert everything from the talloc API to the ralloc API.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Feb 8 00:09:04 UTC 2011
Module: Mesa
Branch: 7.9
Commit: 5afd1d6ac2e99b753b151734f943f0d62374d8ec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5afd1d6ac2e99b753b151734f943f0d62374d8ec
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Feb 3 16:32:06 2011 -0800
Convert everything from the talloc API to the ralloc API.
(cherry-picked from 2ac83dba30dfe6f61b2c9639100acbb329ac4543)
Conflicts:
src/glsl/ast_function.cpp
src/glsl/glcpp/glcpp.c
src/glsl/glsl_parser_extras.cpp
src/glsl/ir.cpp
src/glsl/ir.h
src/glsl/ir_explog_to_explog2.cpp
src/glsl/ir_mat_op_to_vec.cpp
src/glsl/ir_sub_to_add_neg.cpp
src/glsl/lower_texture_projection.cpp
src/glsl/lower_variable_index_to_cond_assign.cpp
src/glsl/lower_vector.cpp
src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
src/mesa/drivers/dri/i965/brw_fs.cpp
src/mesa/drivers/dri/i965/brw_fs.h
src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.h
src/mesa/program/ir_to_mesa.cpp
src/mesa/program/register_allocate.c
src/mesa/program/sampler.cpp
---
src/glsl/ast.h | 10 +-
src/glsl/ast_function.cpp | 20 +-
src/glsl/ast_to_hir.cpp | 4 +-
src/glsl/builtin_function.cpp | 8 +-
src/glsl/builtins/tools/generate_builtins.py | 8 +-
src/glsl/glcpp/glcpp-lex.c | 14 +-
src/glsl/glcpp/glcpp-lex.l | 14 +-
src/glsl/glcpp/glcpp-parse.c | 379 ++++++++++----------
src/glsl/glcpp/glcpp-parse.y | 151 ++++----
src/glsl/glcpp/glcpp.c | 11 +-
src/glsl/glcpp/glcpp.h | 4 +-
src/glsl/glcpp/pp.c | 30 +-
src/glsl/glsl_lexer.cpp | 2 +-
src/glsl/glsl_lexer.lpp | 2 +-
src/glsl/glsl_parser.cpp | 2 +-
src/glsl/glsl_parser.ypp | 2 +-
src/glsl/glsl_parser_extras.cpp | 20 +-
src/glsl/glsl_parser_extras.h | 10 +-
src/glsl/glsl_symbol_table.cpp | 14 +-
src/glsl/glsl_symbol_table.h | 20 +-
src/glsl/glsl_types.cpp | 24 +-
src/glsl/glsl_types.h | 19 +-
src/glsl/ir.cpp | 18 +-
src/glsl/ir.h | 7 +-
src/glsl/ir_algebraic.cpp | 2 +-
src/glsl/ir_clone.cpp | 2 +-
src/glsl/ir_constant_expression.cpp | 10 +-
src/glsl/ir_constant_propagation.cpp | 6 +-
src/glsl/ir_copy_propagation.cpp | 6 +-
src/glsl/ir_dead_code_local.cpp | 4 +-
src/glsl/ir_dead_functions.cpp | 4 +-
src/glsl/ir_explog_to_explog2.cpp | 4 +-
src/glsl/ir_expression_flattening.cpp | 2 +-
src/glsl/ir_function_inlining.cpp | 6 +-
src/glsl/ir_if_to_cond_assign.cpp | 2 +-
src/glsl/ir_import_prototypes.cpp | 2 +-
src/glsl/ir_mat_op_to_vec.cpp | 2 +-
src/glsl/ir_reader.cpp | 18 +-
src/glsl/ir_structure_splitting.cpp | 16 +-
src/glsl/ir_sub_to_add_neg.cpp | 2 +-
src/glsl/ir_validate.cpp | 4 +-
src/glsl/ir_variable_refcount.h | 4 +-
src/glsl/ir_vec_index_to_cond_assign.cpp | 4 +-
src/glsl/ir_vec_index_to_swizzle.cpp | 2 +-
src/glsl/linker.cpp | 22 +-
src/glsl/list.h | 28 +-
src/glsl/loop_analysis.cpp | 14 +-
src/glsl/loop_controls.cpp | 4 +-
src/glsl/loop_unroll.cpp | 4 +-
src/glsl/lower_discard.cpp | 2 +-
src/glsl/lower_noise.cpp | 2 +-
src/glsl/lower_variable_index_to_cond_assign.cpp | 8 +-
src/glsl/main.cpp | 24 +-
src/glsl/s_expression.cpp | 2 +-
src/glsl/s_expression.h | 2 +-
src/mesa/drivers/dri/i965/brw_fs.cpp | 44 ++--
.../dri/i965/brw_fs_channel_expressions.cpp | 2 +-
.../drivers/dri/i965/brw_fs_vector_splitting.cpp | 14 +-
src/mesa/drivers/dri/i965/brw_program.c | 4 +-
src/mesa/main/shaderapi.c | 6 +-
src/mesa/main/shaderobj.c | 12 +-
src/mesa/main/shaderobj.h | 1 +
src/mesa/program/ir_to_mesa.cpp | 68 ++--
63 files changed, 571 insertions(+), 587 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=5afd1d6ac2e99b753b151734f943f0d62374d8ec
More information about the mesa-commit
mailing list