From: Chia-I Wu Date: Tue, 16 Apr 2013 08:24:40 +0000 (+0800) Subject: ilo: hook up pipe context flush function X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86940bf41cb86cddab9efffe03c97c793cf3f6f3;p=mesa.git ilo: hook up pipe context flush function --- diff --git a/src/gallium/drivers/ilo/ilo_context.c b/src/gallium/drivers/ilo/ilo_context.c index 719d6abfed9..714a9bf72c2 100644 --- a/src/gallium/drivers/ilo/ilo_context.c +++ b/src/gallium/drivers/ilo/ilo_context.c @@ -29,6 +29,7 @@ #include "ilo_3d.h" #include "ilo_blit.h" +#include "ilo_cp.h" #include "ilo_gpgpu.h" #include "ilo_query.h" #include "ilo_resource.h" @@ -37,11 +38,70 @@ #include "ilo_video.h" #include "ilo_context.h" +static void +ilo_context_new_cp_batch(struct ilo_cp *cp, void *data) +{ +} + +static void +ilo_context_pre_cp_flush(struct ilo_cp *cp, void *data) +{ +} + +static void +ilo_context_post_cp_flush(struct ilo_cp *cp, void *data) +{ + struct ilo_context *ilo = ilo_context(data); + + if (ilo->last_cp_bo) + ilo->last_cp_bo->unreference(ilo->last_cp_bo); + + /* remember the just flushed bo, on which fences could wait */ + ilo->last_cp_bo = cp->bo; + ilo->last_cp_bo->reference(ilo->last_cp_bo); +} + +static void +ilo_flush(struct pipe_context *pipe, + struct pipe_fence_handle **f, + enum pipe_flush_flags flags) +{ + struct ilo_context *ilo = ilo_context(pipe); + + if (f) { + struct ilo_fence *fence; + + fence = CALLOC_STRUCT(ilo_fence); + if (fence) { + pipe_reference_init(&fence->reference, 1); + + /* reference the batch bo that we want to wait on */ + if (ilo_cp_empty(ilo->cp)) + fence->bo = ilo->last_cp_bo; + else + fence->bo = ilo->cp->bo; + + if (fence->bo) + fence->bo->reference(fence->bo); + } + + *f = (struct pipe_fence_handle *) fence; + } + + ilo_cp_flush(ilo->cp); +} + static void ilo_context_destroy(struct pipe_context *pipe) { struct ilo_context *ilo = ilo_context(pipe); + if (ilo->last_cp_bo) + ilo->last_cp_bo->unreference(ilo->last_cp_bo); + + if (ilo->cp) + ilo_cp_destroy(ilo->cp); + FREE(ilo); } @@ -109,11 +169,24 @@ ilo_context_create(struct pipe_screen *screen, void *priv) } } + ilo->cp = ilo_cp_create(ilo->winsys, is->has_llc); + if (!ilo->cp) { + ilo_context_destroy(&ilo->base); + return NULL; + } + + ilo_cp_set_hook(ilo->cp, ILO_CP_HOOK_NEW_BATCH, + ilo_context_new_cp_batch, (void *) ilo); + ilo_cp_set_hook(ilo->cp, ILO_CP_HOOK_PRE_FLUSH, + ilo_context_pre_cp_flush, (void *) ilo); + ilo_cp_set_hook(ilo->cp, ILO_CP_HOOK_POST_FLUSH, + ilo_context_post_cp_flush, (void *) ilo); + ilo->base.screen = screen; ilo->base.priv = priv; ilo->base.destroy = ilo_context_destroy; - ilo->base.flush = NULL; + ilo->base.flush = ilo_flush; ilo_init_3d_functions(ilo); ilo_init_query_functions(ilo); diff --git a/src/gallium/drivers/ilo/ilo_context.h b/src/gallium/drivers/ilo/ilo_context.h index da340ce5b4b..cb2971f7730 100644 --- a/src/gallium/drivers/ilo/ilo_context.h +++ b/src/gallium/drivers/ilo/ilo_context.h @@ -55,6 +55,8 @@ #define ILO_WM_TEXTURE_SURFACE(i) (ILO_MAX_DRAW_BUFFERS + ILO_MAX_CONST_BUFFERS + i) struct intel_winsys; +struct intel_bo; +struct ilo_cp; struct ilo_screen; struct ilo_context { @@ -73,6 +75,9 @@ struct ilo_context { int max_vs_entries; int max_gs_entries; } urb; + + struct ilo_cp *cp; + struct intel_bo *last_cp_bo; }; static inline struct ilo_context *