Mesa (master): vc4: Move the output semantics setup to a helper.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct 15 16:39:54 2014 +0100

vc4: Move the output semantics setup to a helper.

I want to reuse it elsewhere to set up outputs that aren't in the TGSI.

---

 src/gallium/drivers/vc4/vc4_program.c |   44 +++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index c603425..a79e354 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -1021,6 +1021,29 @@ emit_face_input(struct vc4_compile *c, int attr)
 }
 
 static void
+add_output(struct vc4_compile *c,
+           uint32_t decl_offset,
+           uint8_t semantic_name,
+           uint8_t semantic_index,
+           uint8_t semantic_swizzle)
+{
+        uint32_t old_array_size = c->outputs_array_size;
+        resize_qreg_array(c, &c->outputs, &c->outputs_array_size,
+                          decl_offset + 1);
+
+        if (old_array_size != c->outputs_array_size) {
+                c->output_semantics = reralloc(c,
+                                               c->output_semantics,
+                                               struct vc4_varying_semantic,
+                                               c->outputs_array_size);
+        }
+
+        c->output_semantics[decl_offset].semantic = semantic_name;
+        c->output_semantics[decl_offset].index = semantic_index;
+        c->output_semantics[decl_offset].swizzle = semantic_swizzle;
+}
+
+static void
 emit_tgsi_declaration(struct vc4_compile *c,
                       struct tgsi_full_declaration *decl)
 {
@@ -1062,23 +1085,12 @@ emit_tgsi_declaration(struct vc4_compile *c,
                 break;
 
         case TGSI_FILE_OUTPUT: {
-                uint32_t old_array_size = c->outputs_array_size;
-                resize_qreg_array(c, &c->outputs, &c->outputs_array_size,
-                                  (decl->Range.Last + 1) * 4);
-
-                if (old_array_size != c->outputs_array_size) {
-                        c->output_semantics = reralloc(c,
-                                                       c->output_semantics,
-                                                       struct vc4_varying_semantic,
-                                                       c->outputs_array_size);
-                }
-
-                struct vc4_varying_semantic *sem =
-                        &c->output_semantics[decl->Range.First * 4];
                 for (int i = 0; i < 4; i++) {
-                        sem[i].semantic = decl->Semantic.Name;
-                        sem[i].index = decl->Semantic.Index;
-                        sem[i].swizzle = i;
+                        add_output(c,
+                                   decl->Range.First * 4 + i,
+                                   decl->Semantic.Name,
+                                   decl->Semantic.Index,
+                                   i);
                 }
 
                 switch (decl->Semantic.Name) {