X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_flush.c;h=42430550ea680703a560db9320c1600cb38cee67;hb=437ab1d6df7282770ee869180446db36c2dbdfa8;hp=3627dbd759ca1d75482fb36904351e5767e611f2;hpb=64644ec3b21884d4a974fa29087fa98c4ed9e112;p=mesa.git

diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c
index 3627dbd759c..42430550ea6 100644
--- a/src/gallium/drivers/llvmpipe/lp_flush.c
+++ b/src/gallium/drivers/llvmpipe/lp_flush.c
@@ -31,6 +31,8 @@
 
 
 #include "pipe/p_defines.h"
+#include "pipe/p_screen.h"
+#include "util/u_string.h"
 #include "draw/draw_context.h"
 #include "lp_flush.h"
 #include "lp_context.h"
@@ -38,48 +40,36 @@
 
 
 /**
- * \param flags  bitmask of PIPE_FLUSH_x flags
- * \param fence  if non-null, returns pointer to a fench which can be waited on
+ * \param fence  if non-null, returns pointer to a fence which can be waited on
  */
 void
 llvmpipe_flush( struct pipe_context *pipe,
-		unsigned flags,
-                struct pipe_fence_handle **fence )
+                struct pipe_fence_handle **fence,
+                const char *reason)
 {
    struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
 
    draw_flush(llvmpipe->draw);
 
-   if (fence) {
-      if ((flags & (PIPE_FLUSH_SWAPBUFFERS |
-                    PIPE_FLUSH_RENDER_CACHE))) {
-         /* if we're going to flush the setup/rasterization modules, emit
-          * a fence.
-          * XXX this (and the code below) may need fine tuning...
-          */
-         *fence = lp_setup_fence( llvmpipe->setup );
-      }
-      else {
-         *fence = NULL;
-      }
-   }
-
    /* ask the setup module to flush */
-   if (flags & (PIPE_FLUSH_SWAPBUFFERS | PIPE_FLUSH_RENDER_CACHE |
-                PIPE_FLUSH_TEXTURE_CACHE)) {
-      lp_setup_flush(llvmpipe->setup, flags);
+   lp_setup_flush(llvmpipe->setup, fence, reason);
+
+
+   if (llvmpipe_variant_count > 1000) {
+      /* time to do a garbage collection */
+      gallivm_garbage_collect(llvmpipe->gallivm);
+      llvmpipe_variant_count = 0;
    }
 
    /* Enable to dump BMPs of the color/depth buffers each frame */
-#if 0
-   if (flags & PIPE_FLUSH_FRAME) {
+   if (0) {
       static unsigned frame_no = 1;
       char filename[256];
       unsigned i;
 
       for (i = 0; i < llvmpipe->framebuffer.nr_cbufs; i++) {
-	 util_snprintf(filename, sizeof(filename), "cbuf%u_%u", i, frame_no);
-         debug_dump_surface_bmp(&llvmpipe->pipe, filename, llvmpipe->framebuffer.cbufs[0]);
+         util_snprintf(filename, sizeof(filename), "cbuf%u_%u", i, frame_no);
+         debug_dump_surface_bmp(&llvmpipe->pipe, filename, llvmpipe->framebuffer.cbufs[i]);
       }
 
       if (0) {
@@ -89,68 +79,59 @@ llvmpipe_flush( struct pipe_context *pipe,
 
       ++frame_no;
    }
-#endif
 }
 
+void
+llvmpipe_finish( struct pipe_context *pipe,
+                 const char *reason )
+{
+   struct pipe_fence_handle *fence = NULL;
+   llvmpipe_flush(pipe, &fence, reason);
+   if (fence) {
+      pipe->screen->fence_finish(pipe->screen, fence, PIPE_TIMEOUT_INFINITE);
+      pipe->screen->fence_reference(pipe->screen, &fence, NULL);
+   }
+}
 
 /**
  * Flush context if necessary.
  *
- * TODO: move this logic to an auxiliary library?
+ * Returns FALSE if it would have block, but do_not_block was set, TRUE
+ * otherwise.
  *
- * FIXME: We must implement DISCARD/DONTBLOCK/UNSYNCHRONIZED/etc for
- * textures to avoid blocking.
+ * TODO: move this logic to an auxiliary library?
  */
 boolean
-llvmpipe_flush_texture(struct pipe_context *pipe,
-                       struct pipe_resource *texture,
-                       unsigned face,
-                       unsigned level,
-                       unsigned flush_flags,
-                       boolean read_only,
-                       boolean cpu_access,
-                       boolean do_not_flush)
+llvmpipe_flush_resource(struct pipe_context *pipe,
+                        struct pipe_resource *resource,
+                        unsigned level,
+                        int layer,
+                        boolean read_only,
+                        boolean cpu_access,
+                        boolean do_not_block,
+                        const char *reason)
 {
    unsigned referenced;
 
-   referenced = pipe->is_resource_referenced(pipe, texture, face, level);
+   referenced = llvmpipe_is_resource_referenced(pipe, resource, level, layer);
 
-   if ((referenced & PIPE_REFERENCED_FOR_WRITE) ||
-       ((referenced & PIPE_REFERENCED_FOR_READ) && !read_only)) {
-
-      if (do_not_flush)
-         return FALSE;
-
-      /*
-       * TODO: The semantics of these flush flags are too obtuse. They should
-       * disappear and the pipe driver should just ensure that all visible
-       * side-effects happen when they need to happen.
-       */
-      if (referenced & PIPE_REFERENCED_FOR_WRITE)
-         flush_flags |= PIPE_FLUSH_RENDER_CACHE;
-
-      if (referenced & PIPE_REFERENCED_FOR_READ)
-         flush_flags |= PIPE_FLUSH_TEXTURE_CACHE;
+   if ((referenced & LP_REFERENCED_FOR_WRITE) ||
+       ((referenced & LP_REFERENCED_FOR_READ) && !read_only)) {
 
       if (cpu_access) {
          /*
           * Flush and wait.
           */
+         if (do_not_block)
+            return FALSE;
 
-         struct pipe_fence_handle *fence = NULL;
-
-         pipe->flush(pipe, flush_flags, &fence);
-
-         if (fence) {
-            pipe->screen->fence_finish(pipe->screen, fence, 0);
-            pipe->screen->fence_reference(pipe->screen, &fence, NULL);
-         }
+         llvmpipe_finish(pipe, reason);
       } else {
          /*
           * Just flush.
           */
 
-         pipe->flush(pipe, flush_flags, NULL);
+         llvmpipe_flush(pipe, NULL, reason);
       }
    }