From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Sun, 3 Apr 2016 17:08:20 +0000 (+0200)
Subject: nvc0: add missing glMemoryBarrier bits
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fb3cd24893a03a65995aca9fd741904c166eb8d;p=mesa.git

nvc0: add missing glMemoryBarrier bits

This fixes a bunch of subtests of
arb_shader_image_load_store-host-mem-barrier.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> (v1)
---

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
index 9e8fd6bbb8d..49c4fbe350f 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.c
@@ -91,7 +91,14 @@ nvc0_memory_barrier(struct pipe_context *pipe, unsigned flags)
          }
       }
    }
-   if (flags & PIPE_BARRIER_SHADER_BUFFER) {
+
+   if (flags & (PIPE_BARRIER_SHADER_BUFFER   |
+                PIPE_BARRIER_CONSTANT_BUFFER |
+                PIPE_BARRIER_INDEX_BUFFER    |
+                PIPE_BARRIER_IMAGE           |
+                PIPE_BARRIER_TEXTURE         |
+                PIPE_BARRIER_VERTEX_BUFFER   |
+                PIPE_BARRIER_STREAMOUT_BUFFER)) {
       IMMED_NVC0(push, NVC0_3D(MEM_BARRIER), 0x1011);
    }
 }