util: remove LIST_IS_EMPTY macro

Just use the inlined function directly. The new function was introduced
in addcf410.

Reviewed-by: Eric Engestrom <eric@engestrom.ch>

diff --git a/src/etnaviv/drm/etnaviv_bo_cache.c b/src/etnaviv/drm/etnaviv_bo_cache.c
index 3b28c1477aaccd61278f652b48e8daa96fb05fb3..93893b52b23aefe49ba6ee769133c78eb0284ae1 100644 (file)
--- a/src/etnaviv/drm/etnaviv_bo_cache.c
+++ b/src/etnaviv/drm/etnaviv_bo_cache.c
@@ -78,7 +78,7 @@ void etna_bo_cache_cleanup(struct etna_bo_cache *cache, time_t time)
                struct etna_bo_bucket *bucket = &cache->cache_bucket[i];
                struct etna_bo *bo;
 
                struct etna_bo_bucket *bucket = &cache->cache_bucket[i];
                struct etna_bo *bo;
 

-               while (!LIST_IS_EMPTY(&bucket->list)) {
+               while (!list_is_empty(&bucket->list)) {

                        bo = LIST_ENTRY(struct etna_bo, bucket->list.next, list);
 
                        /* keep things in cache for at least 1 second: */
                        bo = LIST_ENTRY(struct etna_bo, bucket->list.next, list);
 
                        /* keep things in cache for at least 1 second: */


@@ -125,7 +125,7 @@ static struct etna_bo *find_in_bucket(struct etna_bo_bucket *bucket, uint32_t fl
 
        pthread_mutex_lock(&etna_drm_table_lock);
 
 
        pthread_mutex_lock(&etna_drm_table_lock);
 

-       if (LIST_IS_EMPTY(&bucket->list))
+       if (list_is_empty(&bucket->list))

                goto out_unlock;
 
        LIST_FOR_EACH_ENTRY_SAFE(bo, tmp, &bucket->list, list) {
                goto out_unlock;
 
        LIST_FOR_EACH_ENTRY_SAFE(bo, tmp, &bucket->list, list) {

diff --git a/src/freedreno/drm/freedreno_bo_cache.c b/src/freedreno/drm/freedreno_bo_cache.c
index e8193caa721b41c4d0218e80f1bc65402cc39076..88b4454041833c875b8c3f7e149f52cdaf3ff3cd 100644 (file)
--- a/src/freedreno/drm/freedreno_bo_cache.c
+++ b/src/freedreno/drm/freedreno_bo_cache.c
@@ -88,7 +88,7 @@ fd_bo_cache_cleanup(struct fd_bo_cache *cache, time_t time)
                struct fd_bo_bucket *bucket = &cache->cache_bucket[i];
                struct fd_bo *bo;
 
                struct fd_bo_bucket *bucket = &cache->cache_bucket[i];
                struct fd_bo *bo;
 

-               while (!LIST_IS_EMPTY(&bucket->list)) {
+               while (!list_is_empty(&bucket->list)) {

                        bo = LIST_ENTRY(struct fd_bo, bucket->list.next, list);
 
                        /* keep things in cache for at least 1 second: */
                        bo = LIST_ENTRY(struct fd_bo, bucket->list.next, list);
 
                        /* keep things in cache for at least 1 second: */


@@ -141,7 +141,7 @@ static struct fd_bo *find_in_bucket(struct fd_bo_bucket *bucket, uint32_t flags)
         * (MRU, since likely to be in GPU cache), rather than head (LRU)..
         */
        pthread_mutex_lock(&table_lock);
         * (MRU, since likely to be in GPU cache), rather than head (LRU)..
         */
        pthread_mutex_lock(&table_lock);

-       if (!LIST_IS_EMPTY(&bucket->list)) {
+       if (!list_is_empty(&bucket->list)) {

                bo = LIST_ENTRY(struct fd_bo, bucket->list.next, list);
                /* TODO check for compatible flags? */
                if (is_idle(bo)) {
                bo = LIST_ENTRY(struct fd_bo, bucket->list.next, list);
                /* TODO check for compatible flags? */
                if (is_idle(bo)) {

diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c
index f95f07d1ab0bfe2f37846fea7285a939db2d8e3b..9e6d8fd11a06ccd077b52ff22e00b49540f27ef0 100644 (file)
--- a/src/gallium/auxiliary/hud/hud_context.c
+++ b/src/gallium/auxiliary/hud/hud_context.c
@@ -1431,7 +1431,7 @@ hud_parse_env_var(struct hud_context *hud, struct pipe_screen *screen,
          env += num;
 
          strip_hyphens(s);
          env += num;
 
          strip_hyphens(s);

-         if (added && !LIST_IS_EMPTY(&pane->graph_list)) {
+         if (added && !list_is_empty(&pane->graph_list)) {

             struct hud_graph *graph;
             graph = LIST_ENTRY(struct hud_graph, pane->graph_list.prev, head);
             strncpy(graph->name, s, sizeof(graph->name)-1);
             struct hud_graph *graph;
             graph = LIST_ENTRY(struct hud_graph, pane->graph_list.prev, head);
             strncpy(graph->name, s, sizeof(graph->name)-1);

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
index 8cedc42b9164e509b6b72194e90eb492f06b5782..8e54e811488a4684ea88be578ccf296c50306141 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
@@ -391,7 +391,7 @@ pb_debug_manager_create_buffer(struct pb_manager *_mgr,
 #if 0
       mtx_lock(&mgr->mutex);
       debug_printf("%s: failed to create buffer\n", __FUNCTION__);
 #if 0
       mtx_lock(&mgr->mutex);
       debug_printf("%s: failed to create buffer\n", __FUNCTION__);

-      if(!LIST_IS_EMPTY(&mgr->list))
+      if(!list_is_empty(&mgr->list))

          pb_debug_manager_dump_locked(mgr);
       mtx_unlock(&mgr->mutex);
 #endif
          pb_debug_manager_dump_locked(mgr);
       mtx_unlock(&mgr->mutex);
 #endif


@@ -444,7 +444,7 @@ pb_debug_manager_destroy(struct pb_manager *_mgr)
    struct pb_debug_manager *mgr = pb_debug_manager(_mgr);
    
    mtx_lock(&mgr->mutex);
    struct pb_debug_manager *mgr = pb_debug_manager(_mgr);
    
    mtx_lock(&mgr->mutex);

-   if(!LIST_IS_EMPTY(&mgr->list)) {
+   if(!list_is_empty(&mgr->list)) {

       debug_printf("%s: unfreed buffers\n", __FUNCTION__);
       pb_debug_manager_dump_locked(mgr);
    }
       debug_printf("%s: unfreed buffers\n", __FUNCTION__);
       pb_debug_manager_dump_locked(mgr);
    }

diff --git a/src/gallium/auxiliary/pipebuffer/pb_slab.c b/src/gallium/auxiliary/pipebuffer/pb_slab.c
index 844bf3535f6098717eb87c12dba9536dbb26b191..d84686961515ff84552868b26c64eab9d4bee871 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_slab.c
@@ -74,7 +74,7 @@ pb_slab_reclaim(struct pb_slabs *slabs, struct pb_slab_entry *entry)
 static void
 pb_slabs_reclaim_locked(struct pb_slabs *slabs)
 {
 static void
 pb_slabs_reclaim_locked(struct pb_slabs *slabs)
 {

-   while (!LIST_IS_EMPTY(&slabs->reclaim)) {
+   while (!list_is_empty(&slabs->reclaim)) {

       struct pb_slab_entry *entry =
          LIST_ENTRY(struct pb_slab_entry, slabs->reclaim.next, head);
 
       struct pb_slab_entry *entry =
          LIST_ENTRY(struct pb_slab_entry, slabs->reclaim.next, head);
 


@@ -114,20 +114,20 @@ pb_slab_alloc(struct pb_slabs *slabs, unsigned size, unsigned heap)
    /* If there is no candidate slab at all, or the first slab has no free
     * entries, try reclaiming entries.
     */
    /* If there is no candidate slab at all, or the first slab has no free
     * entries, try reclaiming entries.
     */

-   if (LIST_IS_EMPTY(&group->slabs) ||
-       LIST_IS_EMPTY(&LIST_ENTRY(struct pb_slab, group->slabs.next, head)->free))
+   if (list_is_empty(&group->slabs) ||
+       list_is_empty(&LIST_ENTRY(struct pb_slab, group->slabs.next, head)->free))

       pb_slabs_reclaim_locked(slabs);
 
    /* Remove slabs without free entries. */
       pb_slabs_reclaim_locked(slabs);
 
    /* Remove slabs without free entries. */

-   while (!LIST_IS_EMPTY(&group->slabs)) {
+   while (!list_is_empty(&group->slabs)) {

       slab = LIST_ENTRY(struct pb_slab, group->slabs.next, head);
       slab = LIST_ENTRY(struct pb_slab, group->slabs.next, head);

-      if (!LIST_IS_EMPTY(&slab->free))
+      if (!list_is_empty(&slab->free))

          break;
 
       list_del(&slab->head);
    }
 
          break;
 
       list_del(&slab->head);
    }
 

-   if (LIST_IS_EMPTY(&group->slabs)) {
+   if (list_is_empty(&group->slabs)) {

       /* Drop the mutex temporarily to prevent a deadlock where the allocation
        * calls back into slab functions (most likely to happen for
        * pb_slab_reclaim if memory is low).
       /* Drop the mutex temporarily to prevent a deadlock where the allocation
        * calls back into slab functions (most likely to happen for
        * pb_slab_reclaim if memory is low).


@@ -241,7 +241,7 @@ pb_slabs_deinit(struct pb_slabs *slabs)
    /* Reclaim all slab entries (even those that are still in flight). This
     * implicitly calls slab_free for everything.
     */
    /* Reclaim all slab entries (even those that are still in flight). This
     * implicitly calls slab_free for everything.
     */

-   while (!LIST_IS_EMPTY(&slabs->reclaim)) {
+   while (!list_is_empty(&slabs->reclaim)) {

       struct pb_slab_entry *entry =
          LIST_ENTRY(struct pb_slab_entry, slabs->reclaim.next, head);
       pb_slab_reclaim(slabs, entry);
       struct pb_slab_entry *entry =
          LIST_ENTRY(struct pb_slab_entry, slabs->reclaim.next, head);
       pb_slab_reclaim(slabs, entry);

diff --git a/src/gallium/auxiliary/util/u_dirty_surfaces.h b/src/gallium/auxiliary/util/u_dirty_surfaces.h
index 0d84879273962d3aa32fdaa3881556a9d1830342..e9ec5f25953cbf388e6c031c19ae537e0210dda7 100644 (file)
--- a/src/gallium/auxiliary/util/u_dirty_surfaces.h
+++ b/src/gallium/auxiliary/util/u_dirty_surfaces.h
@@ -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)
 {
 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);
 }
       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);
 }


@@ -99,20 +99,20 @@ util_dirty_surface_init(struct util_dirty_surface *ds)
 static inline boolean
 util_dirty_surface_is_dirty(struct util_dirty_surface *ds)
 {
 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)
 {
 }
 
 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))
+   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)
 {
       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))
+   if(!list_is_empty(&ds->dirty_list))

       list_delinit(&ds->dirty_list);
 }
 
       list_delinit(&ds->dirty_list);
 }
 

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_hw.c b/src/gallium/drivers/etnaviv/etnaviv_query_hw.c
index 9324071f41cf917da99a1d9e25e8ee0775337dad..588583c4fdeb94c0fe83e2f170f6ac03ad16a9c2 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_query_hw.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_query_hw.c
@@ -176,7 +176,7 @@ etna_hw_get_query_result(struct etna_context *ctx, struct etna_query *q,
    struct etna_resource *rsc = etna_resource(hq->prsc);
    const struct etna_hw_sample_provider *p = hq->provider;
 
    struct etna_resource *rsc = etna_resource(hq->prsc);
    const struct etna_hw_sample_provider *p = hq->provider;
 

-   assert(LIST_IS_EMPTY(&hq->node));
+   assert(list_is_empty(&hq->node));

 
    if (!wait) {
       int ret;
 
    if (!wait) {
       int ret;

diff --git a/src/gallium/drivers/freedreno/freedreno_query_acc.c b/src/gallium/drivers/freedreno/freedreno_query_acc.c
index dd8665e0ca6513a09cc693843a00d524b7b131c3..49c71c4b6446dae3417dbb0cd6b6bbf3837268b3 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_query_acc.c
+++ b/src/gallium/drivers/freedreno/freedreno_query_acc.c
@@ -123,7 +123,7 @@ fd_acc_get_query_result(struct fd_context *ctx, struct fd_query *q,
 
        DBG("%p: wait=%d, active=%d", q, wait, q->active);
 
 
        DBG("%p: wait=%d, active=%d", q, wait, q->active);
 

-       assert(LIST_IS_EMPTY(&aq->node));
+       assert(list_is_empty(&aq->node));

 
        /* if !wait, then check the last sample (the one most likely to
         * not be ready yet) and bail if it is not ready:
 
        /* if !wait, then check the last sample (the one most likely to
         * not be ready yet) and bail if it is not ready:

diff --git a/src/gallium/drivers/freedreno/freedreno_query_hw.c b/src/gallium/drivers/freedreno/freedreno_query_hw.c
index 6699b98062cc2e9eb20760db3d9907af36ea9895..f1d22328df8e9f4aed42539779960dabf708c5a8 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_query_hw.c
+++ b/src/gallium/drivers/freedreno/freedreno_query_hw.c
@@ -184,10 +184,10 @@ fd_hw_get_query_result(struct fd_context *ctx, struct fd_query *q,
 
        DBG("%p: wait=%d, active=%d", q, wait, q->active);
 
 
        DBG("%p: wait=%d, active=%d", q, wait, q->active);
 

-       if (LIST_IS_EMPTY(&hq->periods))
+       if (list_is_empty(&hq->periods))

                return true;
 
                return true;
 

-       assert(LIST_IS_EMPTY(&hq->list));
+       assert(list_is_empty(&hq->list));

        assert(!hq->period);
 
        /* if !wait, then check the last sample (the one most likely to
        assert(!hq->period);
 
        /* if !wait, then check the last sample (the one most likely to

diff --git a/src/gallium/drivers/nouveau/nouveau_fence.c b/src/gallium/drivers/nouveau/nouveau_fence.c
index d0c66c56128e9a9d7a0b36f176bfdb9418c7020c..a830f8133d7163947c4d7279e183823217139ec1 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_fence.c
+++ b/src/gallium/drivers/nouveau/nouveau_fence.c
@@ -100,7 +100,7 @@ nouveau_fence_del(struct nouveau_fence *fence)
       }
    }
 
       }
    }
 

-   if (!LIST_IS_EMPTY(&fence->work)) {
+   if (!list_is_empty(&fence->work)) {

       debug_printf("WARNING: deleting fence with work still pending !\n");
       nouveau_fence_trigger_work(fence);
    }
       debug_printf("WARNING: deleting fence with work still pending !\n");
       nouveau_fence_trigger_work(fence);
    }

diff --git a/src/gallium/drivers/nouveau/nouveau_mm.c b/src/gallium/drivers/nouveau/nouveau_mm.c
index f44b669e917e757aeebcad4b68264c0aa78e011a..3ba6ea95d1d79b86eb5acf6aed29944cdfc393c0 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_mm.c
+++ b/src/gallium/drivers/nouveau/nouveau_mm.c
@@ -181,10 +181,10 @@ nouveau_mm_allocate(struct nouveau_mman *cache,
       return NULL;
    }
 
       return NULL;
    }
 

-   if (!LIST_IS_EMPTY(&bucket->used)) {
+   if (!list_is_empty(&bucket->used)) {

       slab = LIST_ENTRY(struct mm_slab, bucket->used.next, head);
    } else {
       slab = LIST_ENTRY(struct mm_slab, bucket->used.next, head);
    } else {

-      if (LIST_IS_EMPTY(&bucket->free)) {
+      if (list_is_empty(&bucket->free)) {

          mm_slab_new(cache, MAX2(mm_get_order(size), MM_MIN_ORDER));
       }
       slab = LIST_ENTRY(struct mm_slab, bucket->free.next, head);
          mm_slab_new(cache, MAX2(mm_get_order(size), MM_MIN_ORDER));
       }
       slab = LIST_ENTRY(struct mm_slab, bucket->free.next, head);


@@ -284,8 +284,8 @@ nouveau_mm_destroy(struct nouveau_mman *cache)
       return;
 
    for (i = 0; i < MM_NUM_BUCKETS; ++i) {
       return;
 
    for (i = 0; i < MM_NUM_BUCKETS; ++i) {

-      if (!LIST_IS_EMPTY(&cache->bucket[i].used) ||
-          !LIST_IS_EMPTY(&cache->bucket[i].full))
+      if (!list_is_empty(&cache->bucket[i].used) ||
+          !list_is_empty(&cache->bucket[i].full))

          debug_printf("WARNING: destroying GPU memory cache "
                       "with some buffers still in use\n");
 
          debug_printf("WARNING: destroying GPU memory cache "
                       "with some buffers still in use\n");
 

diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index e91356094ff36d5abbbf2826e1618bc7ef11db49..4c914fa082f63ae190b0050957ed5893cf82f68e 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -298,7 +298,7 @@ void r600_need_dma_space(struct r600_common_context *ctx, unsigned num_dw,
 void r600_preflush_suspend_features(struct r600_common_context *ctx)
 {
        /* suspend queries */
 void r600_preflush_suspend_features(struct r600_common_context *ctx)
 {
        /* suspend queries */

-       if (!LIST_IS_EMPTY(&ctx->active_queries))
+       if (!list_is_empty(&ctx->active_queries))

                r600_suspend_queries(ctx);
 
        ctx->streamout.suspended = false;
                r600_suspend_queries(ctx);
 
        ctx->streamout.suspended = false;


@@ -316,7 +316,7 @@ void r600_postflush_resume_features(struct r600_common_context *ctx)
        }
 
        /* resume queries */
        }
 
        /* resume queries */

-       if (!LIST_IS_EMPTY(&ctx->active_queries))
+       if (!list_is_empty(&ctx->active_queries))

                r600_resume_queries(ctx);
 }
 
                r600_resume_queries(ctx);
 }
 

diff --git a/src/gallium/drivers/radeonsi/gfx10_query.c b/src/gallium/drivers/radeonsi/gfx10_query.c
index c5e668a37609fee44d07479b4ec87950213e4636..c0a0bc8ce57fe70edfa7ccd9c8950f196b5dfdf2 100644 (file)
--- a/src/gallium/drivers/radeonsi/gfx10_query.c
+++ b/src/gallium/drivers/radeonsi/gfx10_query.c
@@ -79,7 +79,7 @@ struct gfx10_sh_query {
 
 static void emit_shader_query(struct si_context *sctx)
 {
 
 static void emit_shader_query(struct si_context *sctx)
 {

-       assert(!LIST_IS_EMPTY(&sctx->shader_query_buffers));
+       assert(!list_is_empty(&sctx->shader_query_buffers));

 
        struct gfx10_sh_query_buffer *qbuf = list_last_entry(&sctx->shader_query_buffers,
                                                             struct gfx10_sh_query_buffer, list);
 
        struct gfx10_sh_query_buffer *qbuf = list_last_entry(&sctx->shader_query_buffers,
                                                             struct gfx10_sh_query_buffer, list);


@@ -119,7 +119,7 @@ static bool gfx10_alloc_query_buffer(struct si_context *sctx)
 
        struct gfx10_sh_query_buffer *qbuf = NULL;
 
 
        struct gfx10_sh_query_buffer *qbuf = NULL;
 

-       if (!LIST_IS_EMPTY(&sctx->shader_query_buffers)) {
+       if (!list_is_empty(&sctx->shader_query_buffers)) {

                qbuf = list_last_entry(&sctx->shader_query_buffers,
                                       struct gfx10_sh_query_buffer, list);
                if (qbuf->head + sizeof(struct gfx10_sh_query_buffer_mem) <= qbuf->buf->b.b.width0)
                qbuf = list_last_entry(&sctx->shader_query_buffers,
                                       struct gfx10_sh_query_buffer, list);
                if (qbuf->head + sizeof(struct gfx10_sh_query_buffer_mem) <= qbuf->buf->b.b.width0)


@@ -510,7 +510,7 @@ void gfx10_init_query(struct si_context *sctx)
 
 void gfx10_destroy_query(struct si_context *sctx)
 {
 
 void gfx10_destroy_query(struct si_context *sctx)
 {

-       while (!LIST_IS_EMPTY(&sctx->shader_query_buffers)) {
+       while (!list_is_empty(&sctx->shader_query_buffers)) {

                struct gfx10_sh_query_buffer *qbuf =
                        list_first_entry(&sctx->shader_query_buffers,
                                         struct gfx10_sh_query_buffer, list);
                struct gfx10_sh_query_buffer *qbuf =
                        list_first_entry(&sctx->shader_query_buffers,
                                         struct gfx10_sh_query_buffer, list);

diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c
index 48bb259339f1e5e2eb1772507986797eaef01b7a..15aed6b236b02958667689770bbe5efd620eadcc 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_gfx_cs.c
+++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c
@@ -154,7 +154,7 @@ void si_flush_gfx_cs(struct si_context *ctx, unsigned flags,
        }
 
        if (ctx->has_graphics) {
        }
 
        if (ctx->has_graphics) {

-               if (!LIST_IS_EMPTY(&ctx->active_queries))
+               if (!list_is_empty(&ctx->active_queries))

                        si_suspend_queries(ctx);
 
                ctx->streamout.suspended = false;
                        si_suspend_queries(ctx);
 
                ctx->streamout.suspended = false;


@@ -426,7 +426,7 @@ void si_begin_new_gfx_cs(struct si_context *ctx)
                si_streamout_buffers_dirty(ctx);
        }
 
                si_streamout_buffers_dirty(ctx);
        }
 

-       if (!LIST_IS_EMPTY(&ctx->active_queries))
+       if (!list_is_empty(&ctx->active_queries))

                si_resume_queries(ctx);
 
        assert(!ctx->gfx_cs->prev_dw);
                si_resume_queries(ctx);
 
        assert(!ctx->gfx_cs->prev_dw);

diff --git a/src/gallium/drivers/svga/svga_screen_cache.c b/src/gallium/drivers/svga/svga_screen_cache.c
index 90ca09121604c597b44438bc40d7a53396f817ed..b5bcd51a7fc6af1c3900983b35bbdffd1cf2ebdb 100644 (file)
--- a/src/gallium/drivers/svga/svga_screen_cache.c
+++ b/src/gallium/drivers/svga/svga_screen_cache.c
@@ -256,7 +256,7 @@ svga_screen_cache_add(struct svga_screen *svgascreen,
       }
    }
 
       }
    }
 

-   if (!LIST_IS_EMPTY(&cache->empty)) {
+   if (!list_is_empty(&cache->empty)) {

       /* An empty entry has no surface associated with it.
        * Use the first empty entry.
        */
       /* An empty entry has no surface associated with it.
        * Use the first empty entry.
        */


@@ -266,7 +266,7 @@ svga_screen_cache_add(struct svga_screen *svgascreen,
       /* Remove from LRU list */
       list_del(&entry->head);
    }
       /* Remove from LRU list */
       list_del(&entry->head);
    }

-   else if (!LIST_IS_EMPTY(&cache->unused)) {
+   else if (!list_is_empty(&cache->unused)) {

       /* free the last used buffer and reuse its entry */
       entry = LIST_ENTRY(struct svga_host_surface_cache_entry,
                          cache->unused.prev, head);
       /* free the last used buffer and reuse its entry */
       entry = LIST_ENTRY(struct svga_host_surface_cache_entry,
                          cache->unused.prev, head);

diff --git a/src/gallium/state_trackers/nine/basetexture9.c b/src/gallium/state_trackers/nine/basetexture9.c
index 441a0817461214076b201aa7558956af55bcc880..ba4deb4e3ad4c782c2b01ba8bb7a7d33a0a9e81a 100644 (file)
--- a/src/gallium/state_trackers/nine/basetexture9.c
+++ b/src/gallium/state_trackers/nine/basetexture9.c
@@ -122,7 +122,7 @@ NineBaseTexture9_SetLOD( struct NineBaseTexture9 *This,
                 0 : This->base.info.last_level;
     This->managed.lod = MIN2(LODNew, max_level);
 
                 0 : This->base.info.last_level;
     This->managed.lod = MIN2(LODNew, max_level);
 

-    if (This->managed.lod != old && This->bind_count && LIST_IS_EMPTY(&This->list))
+    if (This->managed.lod != old && This->bind_count && list_is_empty(&This->list))

        list_add(&This->list, &This->base.base.device->update_textures);
 
     return old;
        list_add(&This->list, &This->base.base.device->update_textures);
 
     return old;

diff --git a/src/gallium/state_trackers/nine/basetexture9.h b/src/gallium/state_trackers/nine/basetexture9.h
index 7c6f66907b327244008031c0cdeb6bfa1f62f424..70e8b934f56d9894f8d6bff8468f5f3cad735c5d 100644 (file)
--- a/src/gallium/state_trackers/nine/basetexture9.h
+++ b/src/gallium/state_trackers/nine/basetexture9.h
@@ -139,7 +139,7 @@ NineBindTextureToDevice( struct NineDevice9 *device,
     struct NineBaseTexture9 *old = *slot;
 
     if (tex) {
     struct NineBaseTexture9 *old = *slot;
 
     if (tex) {

-        if ((tex->managed.dirty | tex->dirty_mip) && LIST_IS_EMPTY(&tex->list))
+        if ((tex->managed.dirty | tex->dirty_mip) && list_is_empty(&tex->list))

             list_add(&tex->list, &device->update_textures);
 
         tex->bind_count++;
             list_add(&tex->list, &device->update_textures);
 
         tex->bind_count++;


@@ -163,7 +163,7 @@ NineBaseTexture9_Dump( struct NineBaseTexture9 *This ) { }
 
 #define BASETEX_REGISTER_UPDATE(t) do { \
     if (((t)->managed.dirty | ((t)->dirty_mip)) && (t)->bind_count) \
 
 #define BASETEX_REGISTER_UPDATE(t) do { \
     if (((t)->managed.dirty | ((t)->dirty_mip)) && (t)->bind_count) \

-        if (LIST_IS_EMPTY(&(t)->list)) \
+        if (list_is_empty(&(t)->list)) \

             list_add(&(t)->list, &(t)->base.base.device->update_textures); \
     } while(0)
 
             list_add(&(t)->list, &(t)->base.base.device->update_textures); \
     } while(0)
 

diff --git a/src/gallium/state_trackers/nine/buffer9.c b/src/gallium/state_trackers/nine/buffer9.c
index f93abaa5c84ab807f743aa252413380298ed2b3e..629f33731ce6d3c7e865e1b417454f2b19494831 100644 (file)
--- a/src/gallium/state_trackers/nine/buffer9.c
+++ b/src/gallium/state_trackers/nine/buffer9.c
@@ -246,7 +246,7 @@ NineBuffer9_Lock( struct NineBuffer9 *This,
         /* Tests on Win: READONLY doesn't wait for the upload */
         if (!(Flags & D3DLOCK_READONLY)) {
             if (!This->managed.dirty) {
         /* Tests on Win: READONLY doesn't wait for the upload */
         if (!(Flags & D3DLOCK_READONLY)) {
             if (!This->managed.dirty) {

-                assert(LIST_IS_EMPTY(&This->managed.list));
+                assert(list_is_empty(&This->managed.list));

                 This->managed.dirty = TRUE;
                 This->managed.dirty_box = box;
                 if (p_atomic_read(&This->managed.pending_upload))
                 This->managed.dirty = TRUE;
                 This->managed.dirty_box = box;
                 if (p_atomic_read(&This->managed.pending_upload))

diff --git a/src/gallium/state_trackers/nine/buffer9.h b/src/gallium/state_trackers/nine/buffer9.h
index 7ae3ea6cc07bf5ffb0f0dbd109525d05620125f9..1c142fcf64adc39ea8995cdc1f07d44ef3f8cde9 100644 (file)
--- a/src/gallium/state_trackers/nine/buffer9.h
+++ b/src/gallium/state_trackers/nine/buffer9.h
@@ -122,7 +122,7 @@ NineBindBufferToDevice( struct NineDevice9 *device,
     struct NineBuffer9 *old = *slot;
 
     if (buf) {
     struct NineBuffer9 *old = *slot;
 
     if (buf) {

-        if ((buf->managed.dirty) && LIST_IS_EMPTY(&buf->managed.list))
+        if ((buf->managed.dirty) && list_is_empty(&buf->managed.list))

             list_add(&buf->managed.list, &device->update_buffers);
         buf->bind_count++;
     }
             list_add(&buf->managed.list, &device->update_buffers);
         buf->bind_count++;
     }


@@ -140,7 +140,7 @@ NineBuffer9_SetDirty( struct NineBuffer9 *This );
 
 #define BASEBUF_REGISTER_UPDATE(b) { \
     if ((b)->managed.dirty && (b)->bind_count) \
 
 #define BASEBUF_REGISTER_UPDATE(b) { \
     if ((b)->managed.dirty && (b)->bind_count) \

-        if (LIST_IS_EMPTY(&(b)->managed.list)) \
+        if (list_is_empty(&(b)->managed.list)) \

             list_add(&(b)->managed.list, &(b)->base.base.device->update_buffers); \
     }
 
             list_add(&(b)->managed.list, &(b)->base.base.device->update_buffers); \
     }
 

diff --git a/src/gallium/state_trackers/omx/bellagio/vid_enc.c b/src/gallium/state_trackers/omx/bellagio/vid_enc.c
index 6ec31378ea196da5e1adcf417f3d2662ab8b0901..8153103e97b2f993261cbd2d2796cb82872dc6de 100644 (file)
--- a/src/gallium/state_trackers/omx/bellagio/vid_enc.c
+++ b/src/gallium/state_trackers/omx/bellagio/vid_enc.c
@@ -820,7 +820,7 @@ static void enc_ClearBframes(omx_base_PortType *port, struct input_buf_private *
    vid_enc_PrivateType *priv = comp->pComponentPrivate;
    struct encode_task *task;
 
    vid_enc_PrivateType *priv = comp->pComponentPrivate;
    struct encode_task *task;
 

-   if (LIST_IS_EMPTY(&priv->b_frames))
+   if (list_is_empty(&priv->b_frames))

       return;
 
    task = LIST_ENTRY(struct encode_task, priv->b_frames.prev, list);
       return;
 
    task = LIST_ENTRY(struct encode_task, priv->b_frames.prev, list);


@@ -928,7 +928,7 @@ static OMX_ERRORTYPE vid_enc_EncodeFrame(omx_base_PortType *port, OMX_BUFFERHEAD
       enc_MoveTasks(&priv->b_frames, &inp->tasks);
    }
 
       enc_MoveTasks(&priv->b_frames, &inp->tasks);
    }
 

-   if (LIST_IS_EMPTY(&inp->tasks))
+   if (list_is_empty(&inp->tasks))

       return port->ReturnBufferFunction(port, buf);
    else
       return base_port_SendBufferFunction(port, buf);
       return port->ReturnBufferFunction(port, buf);
    else
       return base_port_SendBufferFunction(port, buf);

diff --git a/src/gallium/state_trackers/omx/tizonia/h264eprc.c b/src/gallium/state_trackers/omx/tizonia/h264eprc.c
index 877a22f6cfa65a4f5d2a7a0e2ec9888ed1fc0f16..b52e489f21ce8b29a7ce18da24d5898b8c1e8bbd 100644 (file)
--- a/src/gallium/state_trackers/omx/tizonia/h264eprc.c
+++ b/src/gallium/state_trackers/omx/tizonia/h264eprc.c
@@ -268,7 +268,7 @@ static void enc_ClearBframes(vid_enc_PrivateType * priv, struct input_buf_privat
 {
    struct encode_task *task;
 
 {
    struct encode_task *task;
 

-   if (LIST_IS_EMPTY(&priv->b_frames))
+   if (list_is_empty(&priv->b_frames))

       return;
 
    task = LIST_ENTRY(struct encode_task, priv->b_frames.prev, list);
       return;
 
    task = LIST_ENTRY(struct encode_task, priv->b_frames.prev, list);


@@ -382,7 +382,7 @@ static OMX_ERRORTYPE encode_frame(vid_enc_PrivateType * priv, OMX_BUFFERHEADERTY
       enc_MoveTasks(&priv->b_frames, &inp->tasks);
    }
 
       enc_MoveTasks(&priv->b_frames, &inp->tasks);
    }
 

-   if (LIST_IS_EMPTY(&inp->tasks)) {
+   if (list_is_empty(&inp->tasks)) {

       return h264e_buffer_emptied(priv, in_buf);
    } else {
       return h264e_manage_buffers(priv);
       return h264e_buffer_emptied(priv, in_buf);
    } else {
       return h264e_manage_buffers(priv);

diff --git a/src/gallium/state_trackers/omx/vid_enc_common.c b/src/gallium/state_trackers/omx/vid_enc_common.c
index f4acb5cec6a6d358c0f647a0d8f93ae276eec4d6..c15c3516973e4631b0c4f3a8a7f8dbd34ca2cdf1 100644 (file)
--- a/src/gallium/state_trackers/omx/vid_enc_common.c
+++ b/src/gallium/state_trackers/omx/vid_enc_common.c
@@ -130,7 +130,7 @@ void vid_enc_BufferEncoded_common(vid_enc_PrivateType * priv, OMX_BUFFERHEADERTY
    unsigned size;
 
 #if ENABLE_ST_OMX_BELLAGIO
    unsigned size;
 
 #if ENABLE_ST_OMX_BELLAGIO

-   if (!inp || LIST_IS_EMPTY(&inp->tasks)) {
+   if (!inp || list_is_empty(&inp->tasks)) {

       input->nFilledLen = 0; /* mark buffer as empty */
       enc_MoveTasks(&priv->used_tasks, &inp->tasks);
       return;
       input->nFilledLen = 0; /* mark buffer as empty */
       enc_MoveTasks(&priv->used_tasks, &inp->tasks);
       return;


@@ -182,7 +182,7 @@ struct encode_task *enc_NeedTask_common(vid_enc_PrivateType * priv, OMX_VIDEO_PO
    struct pipe_video_buffer templat = {};
    struct encode_task *task;
 
    struct pipe_video_buffer templat = {};
    struct encode_task *task;
 

-   if (!LIST_IS_EMPTY(&priv->free_tasks)) {
+   if (!list_is_empty(&priv->free_tasks)) {

       task = LIST_ENTRY(struct encode_task, priv->free_tasks.next, list);
       list_del(&task->list);
       return task;
       task = LIST_ENTRY(struct encode_task, priv->free_tasks.next, list);
       list_del(&task->list);
       return task;

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index a0a229ccb1b0ae37dd9d2edfd6b85f68a6745a9a..6d3e9c9f7522cf5609123ed95501d23fc7187130 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -295,7 +295,7 @@ static void radeon_bomgr_free_va(const struct radeon_info *info,
     if ((va + size) == heap->start) {
         heap->start = va;
         /* Delete uppermost hole if it reaches the new top */
     if ((va + size) == heap->start) {
         heap->start = va;
         /* Delete uppermost hole if it reaches the new top */

-        if (!LIST_IS_EMPTY(&heap->holes)) {
+        if (!list_is_empty(&heap->holes)) {

             hole = container_of(heap->holes.next, hole, list);
             if ((hole->offset + hole->size) == va) {
                 heap->start = hole->offset;
             hole = container_of(heap->holes.next, hole, list);
             if ((hole->offset + hole->size) == va) {
                 heap->start = hole->offset;

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 418024d33fd4ee8650f539fb616f29d260ccf0c1..9f72a8ef8718afdee63190955f94853dad3aab89 100644 (file)
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -353,7 +353,7 @@ free_zombie_sampler_views(struct st_context *st)
 {
    struct st_zombie_sampler_view_node *entry, *next;
 
 {
    struct st_zombie_sampler_view_node *entry, *next;
 

-   if (LIST_IS_EMPTY(&st->zombie_sampler_views.list.node)) {
+   if (list_is_empty(&st->zombie_sampler_views.list.node)) {

       return;
    }
 
       return;
    }
 


@@ -369,7 +369,7 @@ free_zombie_sampler_views(struct st_context *st)
       free(entry);
    }
 
       free(entry);
    }
 

-   assert(LIST_IS_EMPTY(&st->zombie_sampler_views.list.node));
+   assert(list_is_empty(&st->zombie_sampler_views.list.node));

 
    simple_mtx_unlock(&st->zombie_sampler_views.mutex);
 }
 
    simple_mtx_unlock(&st->zombie_sampler_views.mutex);
 }


@@ -383,7 +383,7 @@ free_zombie_shaders(struct st_context *st)
 {
    struct st_zombie_shader_node *entry, *next;
 
 {
    struct st_zombie_shader_node *entry, *next;
 

-   if (LIST_IS_EMPTY(&st->zombie_shaders.list.node)) {
+   if (list_is_empty(&st->zombie_shaders.list.node)) {

       return;
    }
 
       return;
    }
 


@@ -418,7 +418,7 @@ free_zombie_shaders(struct st_context *st)
       free(entry);
    }
 
       free(entry);
    }
 

-   assert(LIST_IS_EMPTY(&st->zombie_shaders.list.node));
+   assert(list_is_empty(&st->zombie_shaders.list.node));

 
    simple_mtx_unlock(&st->zombie_shaders.mutex);
 }
 
    simple_mtx_unlock(&st->zombie_shaders.mutex);
 }

diff --git a/src/util/list.h b/src/util/list.h
index 7165f15f4ec3263fc14f2621436daf2e2e0593d9..8a18c4b0d8d8b99f500359082a5d1906b2d1a95b 100644 (file)
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -161,9 +161,6 @@ static inline void list_validate(const struct list_head *list)
 #define LIST_ENTRY(__type, __item, __field)   \
     ((__type *)(((char *)(__item)) - offsetof(__type, __field)))
 
 #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.
  *
 /**
  * Cast from a pointer to a member of a struct back to the containing struct.
  *