Used synchronise script to update files

1 files changed, 149 insertions, 149 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_linkage.c b/mesalib/src/gallium/auxiliary/util/u_linkage.c
index 89d67accc..2f6f41ba8 100644
--- a/mesalib/src/gallium/auxiliary/util/u_linkage.c
+++ b/mesalib/src/gallium/auxiliary/util/u_linkage.c
@@ -1,149 +1,149 @@
-/**************************************************************************

- *

- * Copyright 2010 Luca Barbieri

- *

- * Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sublicense, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- *

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial

- * portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

- * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE

- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- *

- **************************************************************************/

-

-#include "util/u_debug.h"

-#include "pipe/p_shader_tokens.h"

-#include "tgsi/tgsi_parse.h"

-#include "tgsi/tgsi_scan.h"

-#include "util/u_linkage.h"

-

-/* we must only record the registers that are actually used, not just declared */

-static INLINE boolean

-util_semantic_set_test_and_set(struct util_semantic_set *set, unsigned value)

-{

-   unsigned mask = 1 << (value % (sizeof(long) * 8));

-   unsigned long *p = &set->masks[value / (sizeof(long) * 8)];

-   unsigned long v = *p & mask;

-   *p |= mask;

-   return !!v;

-}

-

-unsigned

-util_semantic_set_from_program_file(struct util_semantic_set *set, const struct tgsi_token *tokens, enum tgsi_file_type file)

-{

-   struct tgsi_shader_info info;

-   struct tgsi_parse_context parse;

-   unsigned count = 0;

-   ubyte *semantic_name;

-   ubyte *semantic_index;

-

-   tgsi_scan_shader(tokens, &info);

-

-   if(file == TGSI_FILE_INPUT)

-   {

-      semantic_name = info.input_semantic_name;

-      semantic_index = info.input_semantic_index;

-   }

-   else if(file == TGSI_FILE_OUTPUT)

-   {

-      semantic_name = info.output_semantic_name;

-      semantic_index = info.output_semantic_index;

-   }

-   else

-   {

-      assert(0);

-      semantic_name = NULL;

-      semantic_index = NULL;

-   }

-

-   tgsi_parse_init(&parse, tokens);

-

-   memset(set->masks, 0, sizeof(set->masks));

-   while(!tgsi_parse_end_of_tokens(&parse))

-   {

-      tgsi_parse_token(&parse);

-

-      if(parse.FullToken.Token.Type == TGSI_TOKEN_TYPE_INSTRUCTION)

-      {

-	 const struct tgsi_full_instruction *finst = &parse.FullToken.FullInstruction;

-	 unsigned i;

-	 for(i = 0; i < finst->Instruction.NumDstRegs; ++i)

-	 {

-	    if(finst->Dst[i].Register.File == file)

-	    {

-	       unsigned idx = finst->Dst[i].Register.Index;

-	       if(semantic_name[idx] == TGSI_SEMANTIC_GENERIC)

-	       {

-		  if(!util_semantic_set_test_and_set(set, semantic_index[idx]))

-		     ++count;

-	       }

-	    }

-	 }

-

-	 for(i = 0; i < finst->Instruction.NumSrcRegs; ++i)

-	 {

-	    if(finst->Src[i].Register.File == file)

-	    {

-	       unsigned idx = finst->Src[i].Register.Index;

-	       if(semantic_name[idx] == TGSI_SEMANTIC_GENERIC)

-	       {

-		  if(!util_semantic_set_test_and_set(set, semantic_index[idx]))

-		     ++count;

-	       }

-	    }

-	 }

-      }

-   }

-   tgsi_parse_free(&parse);

-

-   return count;

-}

-

-#define UTIL_SEMANTIC_SET_FOR_EACH(i, set) for(i = 0; i < 256; ++i) if(set->masks[i / (sizeof(long) * 8)] & (1 << (i % (sizeof(long) * 8))))

-

-void

-util_semantic_layout_from_set(unsigned char *layout, const struct util_semantic_set *set, unsigned efficient_slots, unsigned num_slots)

-{

-   int first = -1;

-   int last = -1;

-   unsigned i;

-

-   memset(layout, 0xff, num_slots);

-

-   UTIL_SEMANTIC_SET_FOR_EACH(i, set)

-   {

-      if(first < 0)

-	 first = i;

-      last = i;

-   }

-

-   if(last < efficient_slots)

-   {

-      UTIL_SEMANTIC_SET_FOR_EACH(i, set)

-         layout[i] = i;

-   }

-   else if((last - first) < efficient_slots)

-   {

-      UTIL_SEMANTIC_SET_FOR_EACH(i, set)

-         layout[i - first] = i;

-   }

-   else

-   {

-      unsigned idx = 0;

-      UTIL_SEMANTIC_SET_FOR_EACH(i, set)

-         layout[idx++] = i;

-   }

-}

+/**************************************************************************
+ *
+ * Copyright 2010 Luca Barbieri
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+#include "util/u_debug.h"
+#include "pipe/p_shader_tokens.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_scan.h"
+#include "util/u_linkage.h"
+
+/* we must only record the registers that are actually used, not just declared */
+static INLINE boolean
+util_semantic_set_test_and_set(struct util_semantic_set *set, unsigned value)
+{
+   unsigned mask = 1 << (value % (sizeof(long) * 8));
+   unsigned long *p = &set->masks[value / (sizeof(long) * 8)];
+   unsigned long v = *p & mask;
+   *p |= mask;
+   return !!v;
+}
+
+unsigned
+util_semantic_set_from_program_file(struct util_semantic_set *set, const struct tgsi_token *tokens, enum tgsi_file_type file)
+{
+   struct tgsi_shader_info info;
+   struct tgsi_parse_context parse;
+   unsigned count = 0;
+   ubyte *semantic_name;
+   ubyte *semantic_index;
+
+   tgsi_scan_shader(tokens, &info);
+
+   if(file == TGSI_FILE_INPUT)
+   {
+      semantic_name = info.input_semantic_name;
+      semantic_index = info.input_semantic_index;
+   }
+   else if(file == TGSI_FILE_OUTPUT)
+   {
+      semantic_name = info.output_semantic_name;
+      semantic_index = info.output_semantic_index;
+   }
+   else
+   {
+      assert(0);
+      semantic_name = NULL;
+      semantic_index = NULL;
+   }
+
+   tgsi_parse_init(&parse, tokens);
+
+   memset(set->masks, 0, sizeof(set->masks));
+   while(!tgsi_parse_end_of_tokens(&parse))
+   {
+      tgsi_parse_token(&parse);
+
+      if(parse.FullToken.Token.Type == TGSI_TOKEN_TYPE_INSTRUCTION)
+      {
+	 const struct tgsi_full_instruction *finst = &parse.FullToken.FullInstruction;
+	 unsigned i;
+	 for(i = 0; i < finst->Instruction.NumDstRegs; ++i)
+	 {
+	    if(finst->Dst[i].Register.File == file)
+	    {
+	       unsigned idx = finst->Dst[i].Register.Index;
+	       if(semantic_name[idx] == TGSI_SEMANTIC_GENERIC)
+	       {
+		  if(!util_semantic_set_test_and_set(set, semantic_index[idx]))
+		     ++count;
+	       }
+	    }
+	 }
+
+	 for(i = 0; i < finst->Instruction.NumSrcRegs; ++i)
+	 {
+	    if(finst->Src[i].Register.File == file)
+	    {
+	       unsigned idx = finst->Src[i].Register.Index;
+	       if(semantic_name[idx] == TGSI_SEMANTIC_GENERIC)
+	       {
+		  if(!util_semantic_set_test_and_set(set, semantic_index[idx]))
+		     ++count;
+	       }
+	    }
+	 }
+      }
+   }
+   tgsi_parse_free(&parse);
+
+   return count;
+}
+
+#define UTIL_SEMANTIC_SET_FOR_EACH(i, set) for(i = 0; i < 256; ++i) if(set->masks[i / (sizeof(long) * 8)] & (1 << (i % (sizeof(long) * 8))))
+
+void
+util_semantic_layout_from_set(unsigned char *layout, const struct util_semantic_set *set, unsigned efficient_slots, unsigned num_slots)
+{
+   int first = -1;
+   int last = -1;
+   unsigned i;
+
+   memset(layout, 0xff, num_slots);
+
+   UTIL_SEMANTIC_SET_FOR_EACH(i, set)
+   {
+      if(first < 0)
+	 first = i;
+      last = i;
+   }
+
+   if(last < efficient_slots)
+   {
+      UTIL_SEMANTIC_SET_FOR_EACH(i, set)
+         layout[i] = i;
+   }
+   else if((last - first) < efficient_slots)
+   {
+      UTIL_SEMANTIC_SET_FOR_EACH(i, set)
+         layout[i - first] = i;
+   }
+   else
+   {
+      unsigned idx = 0;
+      UTIL_SEMANTIC_SET_FOR_EACH(i, set)
+         layout[idx++] = i;
+   }
+}