import Mesa 11.0.6

2 files changed, 14 insertions, 14 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/util/u_dirty_surfaces.h b/lib/mesa/src/gallium/auxiliary/util/u_dirty_surfaces.h
index 9913a8bd2..ccde8a8c1 100644
--- a/lib/mesa/src/gallium/auxiliary/util/u_dirty_surfaces.h
+++ b/lib/mesa/src/gallium/auxiliary/util/u_dirty_surfaces.h
@@ -50,7 +50,7 @@ struct util_dirty_surface
 static inline void
 util_dirty_surfaces_init(struct util_dirty_surfaces *ds)
 {
-   list_inithead(&ds->dirty_list);
+   LIST_INITHEAD(&ds->dirty_list);
 }
 
 static inline void
@@ -59,7 +59,7 @@ util_dirty_surfaces_use_for_sampling(struct pipe_context *pipe, struct util_dirt
    struct list_head *p, *next;
    for(p = dss->dirty_list.next; p != &dss->dirty_list; p = next)
    {
-      struct util_dirty_surface *ds = list_entry(p, struct util_dirty_surface, dirty_list);
+      struct util_dirty_surface *ds = LIST_ENTRY(struct util_dirty_surface, p, dirty_list);
       next = p->next;
 
       flush(pipe, &ds->base);
@@ -74,7 +74,7 @@ util_dirty_surfaces_use_levels_for_sampling(struct pipe_context *pipe, struct ut
       return;
    for(p = dss->dirty_list.next; p != &dss->dirty_list; p = next)
    {
-      struct util_dirty_surface *ds = list_entry(p, struct util_dirty_surface, dirty_list);
+      struct util_dirty_surface *ds = LIST_ENTRY(struct util_dirty_surface, p, dirty_list);
       next = p->next;
 
       if(ds->base.u.tex.level >= first && ds->base.u.tex.level <= last)
@@ -85,7 +85,7 @@ util_dirty_surfaces_use_levels_for_sampling(struct pipe_context *pipe, struct ut
 static inline void
 util_dirty_surfaces_use_for_sampling_with(struct pipe_context *pipe, struct util_dirty_surfaces *dss, struct pipe_sampler_view *psv, struct pipe_sampler_state *pss, util_dirty_surface_flush_t flush)
 {
-   if(!list_is_empty(&dss->dirty_list))
+   if(!LIST_IS_EMPTY(&dss->dirty_list))
       util_dirty_surfaces_use_levels_for_sampling(pipe, dss, (unsigned)pss->min_lod + psv->u.tex.first_level,
 						  MIN2((unsigned)ceilf(pss->max_lod) + psv->u.tex.first_level, psv->u.tex.last_level), flush);
 }
@@ -93,27 +93,27 @@ util_dirty_surfaces_use_for_sampling_with(struct pipe_context *pipe, struct util
 static inline void
 util_dirty_surface_init(struct util_dirty_surface *ds)
 {
-   list_inithead(&ds->dirty_list);
+   LIST_INITHEAD(&ds->dirty_list);
 }
 
 static inline boolean
 util_dirty_surface_is_dirty(struct util_dirty_surface *ds)
 {
-   return !list_is_empty(&ds->dirty_list);
+   return !LIST_IS_EMPTY(&ds->dirty_list);
 }
 
 static inline void
 util_dirty_surface_set_dirty(struct util_dirty_surfaces *dss, struct util_dirty_surface *ds)
 {
-   if(list_is_empty(&ds->dirty_list))
-      list_addtail(&ds->dirty_list, &dss->dirty_list);
+   if(LIST_IS_EMPTY(&ds->dirty_list))
+      LIST_ADDTAIL(&ds->dirty_list, &dss->dirty_list);
 }
 
 static inline void
 util_dirty_surface_set_clean(struct util_dirty_surfaces *dss, struct util_dirty_surface *ds)
 {
-   if(!list_is_empty(&ds->dirty_list))
-      list_delinit(&ds->dirty_list);
+   if(!LIST_IS_EMPTY(&ds->dirty_list))
+      LIST_DELINIT(&ds->dirty_list);
 }
 
 #endif
diff --git a/lib/mesa/src/gallium/auxiliary/util/u_linear.c b/lib/mesa/src/gallium/auxiliary/util/u_linear.c
index eed7df966..f1aef2167 100644
--- a/lib/mesa/src/gallium/auxiliary/util/u_linear.c
+++ b/lib/mesa/src/gallium/auxiliary/util/u_linear.c
@@ -37,14 +37,14 @@ void
 pipe_linear_to_tile(size_t src_stride, const void *src_ptr,
 		    struct pipe_tile_info *t, void *dst_ptr)
 {
-   unsigned x, y, z;
+   int x, y, z;
    char *ptr;
    size_t bytes = t->cols * t->block.size;
    char *dst_ptr2 = (char *) dst_ptr;
 
    assert(pipe_linear_check_tile(t));
 
-   /* lets write linearly to the tiled buffer */
+   /* lets write lineary to the tiled buffer */
    for (y = 0; y < t->tiles_y; y++) {
       for (x = 0; x < t->tiles_x; x++) {
 	 /* this inner loop could be replace with SSE magic */
@@ -61,12 +61,12 @@ pipe_linear_to_tile(size_t src_stride, const void *src_ptr,
 void pipe_linear_from_tile(struct pipe_tile_info *t, const void *src_ptr,
 			   size_t dst_stride, void *dst_ptr)
 {
-   unsigned x, y, z;
+   int x, y, z;
    char *ptr;
    size_t bytes = t->cols * t->block.size;
    const char *src_ptr2 = (const char *) src_ptr;
 
-   /* lets read linearly from the tiled buffer */
+   /* lets read lineary from the tiled buffer */
    for (y = 0; y < t->tiles_y; y++) {
       for (x = 0; x < t->tiles_x; x++) {
 	 /* this inner loop could be replace with SSE magic */