glsl: Combine nop-swizzle optimization with swizzle-swizzle optimization

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: <thomashelland90@gmail.com>
2017-10-31 23:37:14 -07:00
parent c858abb14f
commit ef1ca06ce8
7 changed files with 52 additions and 118 deletions
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -169,11 +169,10 @@ files_libglsl = files(
  'opt_function_inlining.cpp',
  'opt_if_simplification.cpp',
  'opt_minmax.cpp',
-  'opt_noop_swizzle.cpp',
  'opt_rebalance_tree.cpp',
  'opt_redundant_jumps.cpp',
  'opt_structure_splitting.cpp',
-  'opt_swizzle_swizzle.cpp',
+  'opt_swizzle.cpp',
  'opt_tree_grafting.cpp',
  'opt_vectorize.cpp',
  'program.h',