radv: set writes_memory for global memory stores/atomics

[mesa.git] / src / gallium / auxiliary / util / u_surfaces.c

diff --git a/src/gallium/auxiliary/util/u_surfaces.c b/src/gallium/auxiliary/util/u_surfaces.c
index fd55bd1830c91e56c6155dde81c00da47993c5c3..78b2506e47ba467e6f624bbc3098d3d13cc985a8 100644 (file)
--- a/src/gallium/auxiliary/util/u_surfaces.c
+++ b/src/gallium/auxiliary/util/u_surfaces.c
@@ -31,8 +31,8 @@
 
 boolean
 util_surfaces_do_get(struct util_surfaces *us, unsigned surface_struct_size,
-                     struct pipe_screen *pscreen, struct pipe_resource *pt,
-                     unsigned level, unsigned layer, unsigned flags,
+                     struct pipe_context *ctx, struct pipe_resource *pt,
+                     unsigned level, unsigned layer,
                      struct pipe_surface **res)
 {
    struct pipe_surface *ps;
@@ -51,7 +51,7 @@ util_surfaces_do_get(struct util_surfaces *us, unsigned surface_struct_size,
       ps = us->u.array[level];
    }
 
-   if(ps)
+   if(ps && ps->context == ctx)
    {
       p_atomic_inc(&ps->reference.count);
       *res = ps;
@@ -59,13 +59,13 @@ util_surfaces_do_get(struct util_surfaces *us, unsigned surface_struct_size,
    }
 
    ps = (struct pipe_surface *)CALLOC(1, surface_struct_size);
-   if(!ps)
+   if (!ps)
    {
       *res = NULL;
       return FALSE;
    }
 
-   pipe_surface_init(ps, pt, level, layer, flags);
+   pipe_surface_init(ctx, ps, pt, level, layer);
 
    if(pt->target == PIPE_TEXTURE_3D || pt->target == PIPE_TEXTURE_CUBE)
       cso_hash_insert(us->u.hash, (layer << 8) | level, ps);
@@ -114,7 +114,7 @@ util_surfaces_destroy(struct util_surfaces *us, struct pipe_resource *pt, void (
          for(i = 0; i <= pt->last_level; ++i)
          {
             struct pipe_surface *ps = us->u.array[i];
-            if(ps)
+            if (ps)
                destroy_surface(ps);
          }
          FREE(us->u.array);