gallium: add flags parameter to pipe_screen::context_create

[mesa.git] / src / gallium / drivers / ilo / ilo_context.c

diff --git a/src/gallium/drivers/ilo/ilo_context.c b/src/gallium/drivers/ilo/ilo_context.c
index 04df389c6c2dbf96bacade81cd05b2f690faf9e5..2a00cf1c93c6a32f3f6b0b21341f0e311dc2a50e 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_context.c
+++ b/src/gallium/drivers/ilo/ilo_context.c
@@ -27,12 +27,13 @@
 
 #include "util/u_upload_mgr.h"
 
-#include "ilo_3d.h"
 #include "ilo_blit.h"
 #include "ilo_blitter.h"
 #include "ilo_cp.h"
+#include "ilo_draw.h"
 #include "ilo_gpgpu.h"
 #include "ilo_query.h"
+#include "ilo_render.h"
 #include "ilo_resource.h"
 #include "ilo_screen.h"
 #include "ilo_shader.h"
@@ -42,18 +43,12 @@
 #include "ilo_context.h"
 
 static void
-ilo_context_cp_flushed(struct ilo_cp *cp, void *data)
+ilo_context_cp_submitted(struct ilo_cp *cp, void *data)
 {
    struct ilo_context *ilo = ilo_context(data);
 
-   if (ilo->last_cp_bo)
-      intel_bo_unreference(ilo->last_cp_bo);
-
-   /* remember the just flushed bo, on which fences could wait */
-   ilo->last_cp_bo = cp->bo;
-   intel_bo_reference(ilo->last_cp_bo);
-
-   ilo_3d_cp_flushed(ilo->hw3d);
+   /* builder buffers are reallocated */
+   ilo_render_invalidate_builder(ilo->render);
 }
 
 static void
@@ -63,32 +58,72 @@ ilo_flush(struct pipe_context *pipe,
 {
    struct ilo_context *ilo = ilo_context(pipe);
 
-   ilo_cp_flush(ilo->cp,
+   ilo_cp_submit(ilo->cp,
          (flags & PIPE_FLUSH_END_OF_FRAME) ? "frame end" : "user request");
 
    if (f) {
-      *f = (struct pipe_fence_handle *)
-         ilo_fence_create(pipe->screen, ilo->last_cp_bo);
+      struct pipe_screen *screen = pipe->screen;
+      screen->fence_reference(screen, f, NULL);
+      *f = ilo_screen_fence_create(pipe->screen, ilo->cp->last_submitted_bo);
    }
 }
 
 static void
-ilo_context_destroy(struct pipe_context *pipe)
+ilo_render_condition(struct pipe_context *pipe,
+                     struct pipe_query *query,
+                     boolean condition,
+                     uint mode)
 {
    struct ilo_context *ilo = ilo_context(pipe);
 
-   ilo_cleanup_states(ilo);
+   /* reference count? */
+   ilo->render_condition.query = query;
+   ilo->render_condition.condition = condition;
+   ilo->render_condition.mode = mode;
+}
+
+bool
+ilo_skip_rendering(struct ilo_context *ilo)
+{
+   uint64_t result;
+   bool wait;
+
+   if (!ilo->render_condition.query)
+      return false;
+
+   switch (ilo->render_condition.mode) {
+   case PIPE_RENDER_COND_WAIT:
+   case PIPE_RENDER_COND_BY_REGION_WAIT:
+      wait = true;
+      break;
+   case PIPE_RENDER_COND_NO_WAIT:
+   case PIPE_RENDER_COND_BY_REGION_NO_WAIT:
+   default:
+      wait = false;
+      break;
+   }
+
+   if (ilo->base.get_query_result(&ilo->base, ilo->render_condition.query,
+            wait, (union pipe_query_result *) &result))
+      return ((bool) result == ilo->render_condition.condition);
+   else
+      return false;
+}
+
+static void
+ilo_context_destroy(struct pipe_context *pipe)
+{
+   struct ilo_context *ilo = ilo_context(pipe);
 
-   if (ilo->last_cp_bo)
-      intel_bo_unreference(ilo->last_cp_bo);
+   ilo_state_vector_cleanup(&ilo->state_vector);
 
    if (ilo->uploader)
       u_upload_destroy(ilo->uploader);
 
    if (ilo->blitter)
       ilo_blitter_destroy(ilo->blitter);
-   if (ilo->hw3d)
-      ilo_3d_destroy(ilo->hw3d);
+   if (ilo->render)
+      ilo_render_destroy(ilo->render);
    if (ilo->shader_cache)
       ilo_shader_cache_destroy(ilo->shader_cache);
    if (ilo->cp)
@@ -100,7 +135,7 @@ ilo_context_destroy(struct pipe_context *pipe)
 }
 
 static struct pipe_context *
-ilo_context_create(struct pipe_screen *screen, void *priv)
+ilo_context_create(struct pipe_screen *screen, void *priv, unsigned flags)
 {
    struct ilo_screen *is = ilo_screen(screen);
    struct ilo_context *ilo;
@@ -109,7 +144,7 @@ ilo_context_create(struct pipe_screen *screen, void *priv)
    if (!ilo)
       return NULL;
 
-   ilo->winsys = is->winsys;
+   ilo->winsys = is->dev.winsys;
    ilo->dev = &is->dev;
 
    /*
@@ -119,27 +154,27 @@ ilo_context_create(struct pipe_screen *screen, void *priv)
    util_slab_create(&ilo->transfer_mempool,
          sizeof(struct ilo_transfer), 64, UTIL_SLAB_SINGLETHREADED);
 
-   /* 8192 DWords */
-   ilo->cp = ilo_cp_create(ilo->winsys, 8192, is->dev.has_llc);
    ilo->shader_cache = ilo_shader_cache_create();
+   ilo->cp = ilo_cp_create(ilo->dev, ilo->winsys, ilo->shader_cache);
    if (ilo->cp)
-      ilo->hw3d = ilo_3d_create(ilo->cp, ilo->dev);
+      ilo->render = ilo_render_create(&ilo->cp->builder);
 
-   if (!ilo->cp || !ilo->shader_cache || !ilo->hw3d) {
+   if (!ilo->cp || !ilo->shader_cache || !ilo->render) {
       ilo_context_destroy(&ilo->base);
       return NULL;
    }
 
-   ilo_cp_set_flush_callback(ilo->cp,
-         ilo_context_cp_flushed, (void *) ilo);
+   ilo_cp_set_submit_callback(ilo->cp,
+         ilo_context_cp_submitted, (void *) ilo);
 
    ilo->base.screen = screen;
    ilo->base.priv = priv;
 
    ilo->base.destroy = ilo_context_destroy;
    ilo->base.flush = ilo_flush;
+   ilo->base.render_condition = ilo_render_condition;
 
-   ilo_init_3d_functions(ilo);
+   ilo_init_draw_functions(ilo);
    ilo_init_query_functions(ilo);
    ilo_init_state_functions(ilo);
    ilo_init_blit_functions(ilo);
@@ -147,7 +182,8 @@ ilo_context_create(struct pipe_screen *screen, void *priv)
    ilo_init_video_functions(ilo);
    ilo_init_gpgpu_functions(ilo);
 
-   ilo_init_states(ilo);
+   ilo_init_draw(ilo);
+   ilo_state_vector_init(ilo->dev, &ilo->state_vector);
 
    /*
     * These must be called last as u_upload/u_blitter are clients of the pipe