Mesa (master): glsl: move variables in to ir_variable::data, part II

Tapani Pälli tpalli at kemper.freedesktop.org
Thu Dec 12 15:32:58 UTC 2013


Module: Mesa
Branch: master
Commit: 447bb9029f7e03b03e507053b9f63536d8fc74ac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=447bb9029f7e03b03e507053b9f63536d8fc74ac

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Dec 12 15:08:59 2013 +0200

glsl: move variables in to ir_variable::data, part II

This patch moves following bitfields and variables to the data
structure:

explicit_location, explicit_index, explicit_binding, has_initializer,
is_unmatched_generic_inout, location_frac, from_named_ifc_block_nonarray,
from_named_ifc_block_array, depth_layout, location, index, binding,
max_array_access, atomic

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Paul Berry <stereotype441 at gmail.com>

---

 src/glsl/ast_array_index.cpp                      |    6 +-
 src/glsl/ast_to_hir.cpp                           |   61 +++---
 src/glsl/builtin_variables.cpp                    |    8 +-
 src/glsl/ir.cpp                                   |   17 +-
 src/glsl/ir.h                                     |  212 ++++++++++----------
 src/glsl/ir_clone.cpp                             |   22 +-
 src/glsl/ir_set_program_inouts.cpp                |    6 +-
 src/glsl/ir_validate.cpp                          |    6 +-
 src/glsl/link_atomics.cpp                         |   20 +-
 src/glsl/link_functions.cpp                       |   10 +-
 src/glsl/link_uniform_initializers.cpp            |    4 +-
 src/glsl/link_uniforms.cpp                        |   14 +-
 src/glsl/link_varyings.cpp                        |   26 ++--
 src/glsl/linker.cpp                               |   93 +++++-----
 src/glsl/lower_clip_distance.cpp                  |    8 +-
 src/glsl/lower_named_interface_blocks.cpp         |    8 +-
 src/glsl/lower_packed_varyings.cpp                |    8 +-
 src/glsl/lower_ubo_reference.cpp                  |    2 +-
 src/glsl/opt_dead_builtin_varyings.cpp            |   16 +-
 src/glsl/opt_flip_matrices.cpp                    |    4 +-
 src/glsl/tests/builtin_variable_test.cpp          |   76 ++++----
 src/glsl/tests/invalidate_locations_test.cpp      |   96 +++++-----
 src/mesa/drivers/dri/i965/brw_fs.cpp              |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_fp.cpp           |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp      |   28 ++--
 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp    |   16 +-
 src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp |    2 +-
 src/mesa/main/ff_fragment_shader.cpp              |    8 +-
 src/mesa/main/shader_query.cpp                    |   24 ++--
 src/mesa/program/ir_to_mesa.cpp                   |   14 +-
 src/mesa/state_tracker/st_glsl_to_tgsi.cpp        |   13 +-
 31 files changed, 421 insertions(+), 411 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=447bb9029f7e03b03e507053b9f63536d8fc74ac



More information about the mesa-commit mailing list