libX11 xserver pixman mesa git update 16 Apr 2012

4 files changed, 178 insertions, 146 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c
index 3e9cbffe9..6a9141209 100644
--- a/mesalib/src/gallium/auxiliary/util/u_blitter.c
+++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c
@@ -276,7 +276,7 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe)
    for (i = 0; i < 4; i++)
       ctx->vertices[i][0][3] = 1; /*v.w*/
 
-   ctx->upload = u_upload_create(pipe, 65536, 128, PIPE_BIND_VERTEX_BUFFER);
+   ctx->upload = u_upload_create(pipe, 65536, 4, PIPE_BIND_VERTEX_BUFFER);
 
    return &ctx->base;
 }
diff --git a/mesalib/src/gallium/auxiliary/util/u_double_list.h b/mesalib/src/gallium/auxiliary/util/u_double_list.h
index 29f0b9d09..9d1129b18 100644
--- a/mesalib/src/gallium/auxiliary/util/u_double_list.h
+++ b/mesalib/src/gallium/auxiliary/util/u_double_list.h
@@ -1,141 +1,146 @@
-/**************************************************************************

- * 

- * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.

- * All Rights Reserved.

- * 

- * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL

- * THE COPYRIGHT HOLDERS, AUTHORS 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.

- *

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

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

- * of the Software.

- * 

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

-

-/**

- * \file

- * List macros heavily inspired by the Linux kernel

- * list handling. No list looping yet.

- * 

- * Is not threadsafe, so common operations need to

- * be protected using an external mutex.

- */

-

-#ifndef _U_DOUBLE_LIST_H_

-#define _U_DOUBLE_LIST_H_

-

-

-#include <stddef.h>

-#include "pipe/p_compiler.h"

-

-

-struct list_head

-{

-    struct list_head *prev;

-    struct list_head *next;

-};

-

-static INLINE void list_inithead(struct list_head *item)

-{

-    item->prev = item;

-    item->next = item;

-}

-

-static INLINE void list_add(struct list_head *item, struct list_head *list)

-{

-    item->prev = list;

-    item->next = list->next;

-    list->next->prev = item;

-    list->next = item;

-}

-

-static INLINE void list_addtail(struct list_head *item, struct list_head *list)

-{

-    item->next = list;

-    item->prev = list->prev;

-    list->prev->next = item;

-    list->prev = item;

-}

-

-static INLINE void list_replace(struct list_head *from, struct list_head *to)

-{

-    to->prev = from->prev;

-    to->next = from->next;

-    from->next->prev = to;

-    from->prev->next = to;

-}

-

-static INLINE void list_del(struct list_head *item)

-{

-    item->prev->next = item->next;

-    item->next->prev = item->prev;

-}

-

-static INLINE void list_delinit(struct list_head *item)

-{

-    item->prev->next = item->next;

-    item->next->prev = item->prev;

-    item->next = item;

-    item->prev = item;

-}

-

-#define LIST_INITHEAD(__item) list_inithead(__item)

-#define LIST_ADD(__item, __list) list_add(__item, __list)

-#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list)

-#define LIST_REPLACE(__from, __to) list_replace(__from, __to)

-#define LIST_DEL(__item) list_del(__item)

-#define LIST_DELINIT(__item) list_delinit(__item)

-

-#define LIST_ENTRY(__type, __item, __field)   \

-    ((__type *)(((char *)(__item)) - offsetof(__type, __field)))

-

-#define LIST_IS_EMPTY(__list)                   \

-    ((__list)->next == (__list))

-

-#ifndef container_of

-#define container_of(ptr, sample, member)				\

-    (void *)((char *)(ptr)						\

-	     - ((char *)&(sample)->member - (char *)(sample)))

-#endif

-

-#define LIST_FOR_EACH_ENTRY(pos, head, member)				\

-   for (pos = container_of((head)->next, pos, member);			\

-	&pos->member != (head);						\

-	pos = container_of(pos->member.next, pos, member))

-

-#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member)	\

-   for (pos = container_of((head)->next, pos, member),			\

-	storage = container_of(pos->member.next, pos, member);	\

-	&pos->member != (head);						\

-	pos = storage, storage = container_of(storage->member.next, storage, member))

-

-#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member)	\

-   for (pos = container_of((head)->prev, pos, member),			\

-	storage = container_of(pos->member.prev, pos, member);		\

-	&pos->member != (head);						\

-	pos = storage, storage = container_of(storage->member.prev, storage, member))

-

-#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member)		\

-   for (pos = container_of((start), pos, member);			\

-	&pos->member != (head);						\

-	pos = container_of(pos->member.next, pos, member))

-

-#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member)		\

-   for (pos = container_of((start), pos, member);			\

-	&pos->member != (head);						\

-	pos = container_of(pos->member.prev, pos, member))

-

-#endif /*_U_DOUBLE_LIST_H_*/

+/**************************************************************************
+ * 
+ * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.
+ * All Rights Reserved.
+ * 
+ * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS 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.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ **************************************************************************/
+
+/**
+ * \file
+ * List macros heavily inspired by the Linux kernel
+ * list handling. No list looping yet.
+ * 
+ * Is not threadsafe, so common operations need to
+ * be protected using an external mutex.
+ */
+
+#ifndef _U_DOUBLE_LIST_H_
+#define _U_DOUBLE_LIST_H_
+
+
+#include <stddef.h>
+#include "pipe/p_compiler.h"
+
+
+struct list_head
+{
+    struct list_head *prev;
+    struct list_head *next;
+};
+
+static INLINE void list_inithead(struct list_head *item)
+{
+    item->prev = item;
+    item->next = item;
+}
+
+static INLINE void list_add(struct list_head *item, struct list_head *list)
+{
+    item->prev = list;
+    item->next = list->next;
+    list->next->prev = item;
+    list->next = item;
+}
+
+static INLINE void list_addtail(struct list_head *item, struct list_head *list)
+{
+    item->next = list;
+    item->prev = list->prev;
+    list->prev->next = item;
+    list->prev = item;
+}
+
+static INLINE void list_replace(struct list_head *from, struct list_head *to)
+{
+    to->prev = from->prev;
+    to->next = from->next;
+    from->next->prev = to;
+    from->prev->next = to;
+}
+
+static INLINE void list_del(struct list_head *item)
+{
+    item->prev->next = item->next;
+    item->next->prev = item->prev;
+}
+
+static INLINE void list_delinit(struct list_head *item)
+{
+    item->prev->next = item->next;
+    item->next->prev = item->prev;
+    item->next = item;
+    item->prev = item;
+}
+
+#define LIST_INITHEAD(__item) list_inithead(__item)
+#define LIST_ADD(__item, __list) list_add(__item, __list)
+#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list)
+#define LIST_REPLACE(__from, __to) list_replace(__from, __to)
+#define LIST_DEL(__item) list_del(__item)
+#define LIST_DELINIT(__item) list_delinit(__item)
+
+#define LIST_ENTRY(__type, __item, __field)   \
+    ((__type *)(((char *)(__item)) - offsetof(__type, __field)))
+
+#define LIST_IS_EMPTY(__list)                   \
+    ((__list)->next == (__list))
+
+/**
+ * Cast from a pointer to a member of a struct back to the containing struct.
+ *
+ * 'sample' MUST be initialized, or else the result is undefined!
+ */
+#ifndef container_of
+#define container_of(ptr, sample, member)				\
+    (void *)((char *)(ptr)						\
+	     - ((char *)&(sample)->member - (char *)(sample)))
+#endif
+
+#define LIST_FOR_EACH_ENTRY(pos, head, member)				\
+   for (pos = NULL, pos = container_of((head)->next, pos, member);	\
+	&pos->member != (head);						\
+	pos = container_of(pos->member.next, pos, member))
+
+#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member)	\
+   for (pos = NULL, pos = container_of((head)->next, pos, member),	\
+	storage = container_of(pos->member.next, pos, member);	\
+	&pos->member != (head);						\
+	pos = storage, storage = container_of(storage->member.next, storage, member))
+
+#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member)	\
+   for (pos = NULL, pos = container_of((head)->prev, pos, member),	\
+	storage = container_of(pos->member.prev, pos, member);		\
+	&pos->member != (head);						\
+	pos = storage, storage = container_of(storage->member.prev, storage, member))
+
+#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member)		\
+   for (pos = NULL, pos = container_of((start), pos, member);		\
+	&pos->member != (head);						\
+	pos = container_of(pos->member.next, pos, member))
+
+#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member)		\
+   for (pos = NULL, pos = container_of((start), pos, member);		\
+	&pos->member != (head);						\
+	pos = container_of(pos->member.prev, pos, member))
+
+#endif /*_U_DOUBLE_LIST_H_*/
diff --git a/mesalib/src/gallium/auxiliary/util/u_dual_blend.h b/mesalib/src/gallium/auxiliary/util/u_dual_blend.h
new file mode 100644
index 000000000..e31d43c18
--- /dev/null
+++ b/mesalib/src/gallium/auxiliary/util/u_dual_blend.h
@@ -0,0 +1,26 @@
+#ifndef U_DUAL_BLEND_H
+#define U_DUAL_BLEND_H
+
+#include "pipe/p_state.h"
+
+static INLINE boolean util_blend_factor_is_dual_src(int factor)
+{
+   return (factor == PIPE_BLENDFACTOR_SRC1_COLOR) ||
+          (factor == PIPE_BLENDFACTOR_SRC1_ALPHA) ||
+          (factor == PIPE_BLENDFACTOR_INV_SRC1_COLOR) ||
+          (factor == PIPE_BLENDFACTOR_INV_SRC1_ALPHA);
+}
+
+static INLINE boolean util_blend_state_is_dual(const struct pipe_blend_state *blend, 
+				  int index)
+{
+   if (util_blend_factor_is_dual_src(blend->rt[index].rgb_src_factor) ||
+       util_blend_factor_is_dual_src(blend->rt[index].alpha_src_factor) ||
+       util_blend_factor_is_dual_src(blend->rt[index].rgb_dst_factor) ||
+       util_blend_factor_is_dual_src(blend->rt[index].alpha_dst_factor))
+      return true;
+   return false;
+}
+
+
+#endif
diff --git a/mesalib/src/gallium/auxiliary/util/u_linkage.h b/mesalib/src/gallium/auxiliary/util/u_linkage.h
index 43ec917fc..7b23123d3 100644
--- a/mesalib/src/gallium/auxiliary/util/u_linkage.h
+++ b/mesalib/src/gallium/auxiliary/util/u_linkage.h
@@ -49,15 +49,16 @@ unsigned util_semantic_set_from_program_file(struct util_semantic_set *set, cons
  *
  * num_slots is the size of the layout array and hardware limit instead.
  *
- * efficient_slots == 0 or efficient_solts == num_slots are typical settings.
+ * efficient_slots == 0 or efficient_slots == num_slots are typical settings.
  */
 void util_semantic_layout_from_set(unsigned char *layout, const struct util_semantic_set *set, unsigned efficient_slots, unsigned num_slots);
 
 static INLINE void
-util_semantic_table_from_layout(unsigned char *table, unsigned char *layout, unsigned char first_slot_value, unsigned char num_slots)
+util_semantic_table_from_layout(unsigned char *table, size_t table_size, unsigned char *layout,
+                                unsigned char first_slot_value, unsigned char num_slots)
 {
-   int i;
-   memset(table, 0xff, sizeof(table));
+   unsigned char i;
+   memset(table, 0xff, table_size);
 
    for(i = 0; i < num_slots; ++i)
       table[layout[i]] = first_slot_value + i;