Mesa (master): vc4: Merge qcompile and tgsi_to_qir

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug 13 13:41:22 2014 -0700

vc4: Merge qcompile and tgsi_to_qir

The split between these two didn't make much sense.  I'm going to want the
chance to look at uniform contents in optimization passes, and the QPU
emit I think is going to end up rewriting the uniforms stream.

---

 src/gallium/drivers/vc4/vc4_context.h              |    2 +-
 src/gallium/drivers/vc4/vc4_opt_algebraic.c        |    2 +-
 src/gallium/drivers/vc4/vc4_opt_copy_propagation.c |    2 +-
 src/gallium/drivers/vc4/vc4_opt_cse.c              |    2 +-
 src/gallium/drivers/vc4/vc4_opt_dead_code.c        |    2 +-
 src/gallium/drivers/vc4/vc4_program.c              |  631 +++++++++-----------
 src/gallium/drivers/vc4/vc4_qir.c                  |   14 +-
 src/gallium/drivers/vc4/vc4_qir.h                  |   58 +-
 src/gallium/drivers/vc4/vc4_qpu_emit.c             |   16 +-
 9 files changed, 327 insertions(+), 402 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=4bca922878a4d433077d21d4918b1db71b3a15f7