ilo: rework winsys batch buffer functions

Rename

  intel_winsys_check_aperture_size() to intel_winsys_can_submit_bo(),
  intel_bo_exec() to intel_winsys_submit_bo(), and
  intel_winsys_decode_commands() to intel_winsys_decode_bo().

Make a semantic change to ignore intel_context when the ring is not the render
ring.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c
index cda58eb0a80..8bcb19625f8 100644
--- a/src/gallium/drivers/ilo/ilo_cp.c
+++ b/src/gallium/drivers/ilo/ilo_cp.c
@@ -42,7 +42,7 @@ ilo_cp_dump(struct ilo_cp *cp)
 {
    ilo_printf("dumping %d bytes\n", cp->used * 4);
    if (cp->used)
-      intel_winsys_decode_commands(cp->winsys, cp->bo, cp->used * 4);
+      intel_winsys_decode_bo(cp->winsys, cp->bo, cp->used * 4);
 }
 
 /**
@@ -182,31 +182,31 @@ static int
 ilo_cp_exec_bo(struct ilo_cp *cp)
 {
    const bool do_exec = !(ilo_debug & ILO_DEBUG_NOHW);
-   struct intel_context *ctx;
    unsigned long flags;
    int err;
 
    switch (cp->ring) {
    case ILO_CP_RING_RENDER:
-      ctx = cp->render_ctx;
       flags = INTEL_EXEC_RENDER;
       break;
    case ILO_CP_RING_BLT:
-      ctx = NULL;
       flags = INTEL_EXEC_BLT;
       break;
    default:
-      ctx = NULL;
+      assert(!"unknown cp ring");
       flags = 0;
       break;
    }
 
    flags |= cp->one_off_flags;
 
-   if (likely(do_exec))
-      err = intel_bo_exec(cp->bo, cp->used * 4, ctx, flags);
-   else
+   if (likely(do_exec)) {
+      err = intel_winsys_submit_bo(cp->winsys,
+            cp->bo, cp->used * 4, cp->render_ctx, flags);
+   }
+   else {
       err = 0;
+   }
 
    cp->one_off_flags = 0;