radeonsi: remove redundant si_shader_info::images_declared

[mesa.git] / src / gallium / drivers / svga / svga_link.c

diff --git a/src/gallium/drivers/svga/svga_link.c b/src/gallium/drivers/svga/svga_link.c
index f3e524d38eaef2c8146500afbaddff54545a9402..394040d93036e7d9947245f6a91961fab95e6673 100644 (file)
--- a/src/gallium/drivers/svga/svga_link.c
+++ b/src/gallium/drivers/svga/svga_link.c
@@ -25,6 +25,7 @@
 
 #include "svga_context.h"
 #include "svga_link.h"
+#include "svga_debug.h"
 
 #include "tgsi/tgsi_strings.h"
 
@@ -45,65 +46,93 @@ svga_link_shaders(const struct tgsi_shader_info *outshader_info,
 {
    unsigned i, free_slot;
 
-   for (i = 0; i < Elements(linkage->input_map); i++) {
+   for (i = 0; i < ARRAY_SIZE(linkage->input_map); i++) {
       linkage->input_map[i] = INVALID_INDEX;
    }
 
+   for (i = 0; i < ARRAY_SIZE(linkage->prevShader.output_map); i++) {
+      linkage->prevShader.output_map[i] = INVALID_INDEX;
+   }
+
    /* Assign input slots for input shader inputs.
     * Basically, we want to use the same index for the output shader's outputs
     * and the input shader's inputs that should be linked together.
     * We'll modify the input shader's inputs to match the output shader.
     */
    assert(inshader_info->num_inputs <=
-          Elements(inshader_info->input_semantic_name));
+          ARRAY_SIZE(inshader_info->input_semantic_name));
 
    /* free register index that can be used for built-in varyings */
    free_slot = outshader_info->num_outputs + 1;
 
    for (i = 0; i < inshader_info->num_inputs; i++) {
-      unsigned sem_name = inshader_info->input_semantic_name[i];
+      enum tgsi_semantic sem_name = inshader_info->input_semantic_name[i];
       unsigned sem_index = inshader_info->input_semantic_index[i];
       unsigned j;
+      unsigned out_index;
+
+      /* search output shader outputs for same item */
+      for (j = 0; j < outshader_info->num_outputs; j++) {
+         assert(j < ARRAY_SIZE(outshader_info->output_semantic_name));
+         if (outshader_info->output_semantic_name[j] == sem_name &&
+             outshader_info->output_semantic_index[j] == sem_index) {
+            linkage->input_map[i] = j;
+            linkage->prevShader.output_map[j] = i;
+            break;
+         }
+      }
+
       /**
-       * Get the clip distance inputs from the output shader's
-       * clip distance shadow copy.
+       * The clip distance inputs come from the output shader's
+       * clip distance shadow copy, so mark the input index to match
+       * the index of the shadow copy.
        */
       if (sem_name == TGSI_SEMANTIC_CLIPDIST) {
-         linkage->input_map[i] = outshader_info->num_outputs + 1 + sem_index;
+         out_index = outshader_info->num_outputs + 1 + sem_index;
+         linkage->input_map[i] = out_index;
+         linkage->prevShader.output_map[out_index] = i;
          /* make sure free_slot includes this extra output */
          free_slot = MAX2(free_slot, linkage->input_map[i] + 1);
       }
-      else {
-         /* search output shader outputs for same item */
-         for (j = 0; j < outshader_info->num_outputs; j++) {
-            assert(j < Elements(outshader_info->output_semantic_name));
-            if (outshader_info->output_semantic_name[j] == sem_name &&
-                outshader_info->output_semantic_index[j] == sem_index) {
-               linkage->input_map[i] = j;
-               break;
-            }
-         }
+   }
+
+   /* Find the index for position */
+   linkage->position_index = 0;
+   for (i = 0; i < outshader_info->num_outputs; i++) {
+      if (outshader_info->output_semantic_name[i] == TGSI_SEMANTIC_POSITION) {
+         linkage->position_index = i;
+         break;
       }
    }
 
    linkage->num_inputs = inshader_info->num_inputs;
+   linkage->prevShader.num_outputs = outshader_info->num_outputs;
 
    /* Things like the front-face register are handled here */
    for (i = 0; i < inshader_info->num_inputs; i++) {
       if (linkage->input_map[i] == INVALID_INDEX) {
          unsigned j = free_slot++;
          linkage->input_map[i] = j;
+         linkage->prevShader.output_map[j] = i;
       }
    }
+   linkage->input_map_max = free_slot - 1;
 
    /* Debug */
-   if (0) {
-      unsigned reg = 0;
+   if (SVGA_DEBUG & DEBUG_TGSI) {
+      uint64_t reg = 0;
+      uint64_t one = 1;
+
+      debug_printf(
+      "### linkage info: num_inputs=%d input_map_max=%d prevShader.num_outputs=%d\n",
+                   linkage->num_inputs, linkage->input_map_max,
+                   linkage->prevShader.num_outputs);
+
       for (i = 0; i < linkage->num_inputs; i++) {
 
          assert(linkage->input_map[i] != INVALID_INDEX);
 
-         debug_printf("input shader input[%d] slot %u  %s %u %s\n",
+         debug_printf("   input[%d] slot %u  %s %u %s\n",
                       i,
                       linkage->input_map[i],
                       tgsi_semantic_names[inshader_info->input_semantic_name[i]],
@@ -111,10 +140,8 @@ svga_link_shaders(const struct tgsi_shader_info *outshader_info,
                       tgsi_interpolate_names[inshader_info->input_interpolate[i]]);
 
          /* make sure no repeating register index */
-         if (reg & 1 << linkage->input_map[i]) {
-            assert(0);
-         }
-         reg |= 1 << linkage->input_map[i];
+         assert((reg & (one << linkage->input_map[i])) == 0);
+         reg |= one << linkage->input_map[i];
       }
    }
 }