From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Sun, 23 Feb 2020 12:34:49 +0000 (+0200)
Subject: blorp: rename workaround address function
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ff5b9e6923d2083da6c97b6569e50dad78a72eb;p=mesa.git

blorp: rename workaround address function

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3203>
---

diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index fdc4c49ea32..028e7c592be 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -224,7 +224,7 @@ blorp_vf_invalidate_for_vb_48b_transitions(struct blorp_batch *blorp_batch,
 }
 
 static struct blorp_address
-blorp_get_workaround_page(struct blorp_batch *blorp_batch)
+blorp_get_workaround_address(struct blorp_batch *blorp_batch)
 {
    struct iris_batch *batch = blorp_batch->driver_batch;
 
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index 6e74683f4e0..48b1634f300 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -67,7 +67,7 @@ blorp_vf_invalidate_for_vb_48b_transitions(struct blorp_batch *batch,
                                            unsigned num_vbs);
 
 UNUSED static struct blorp_address
-blorp_get_workaround_page(struct blorp_batch *batch);
+blorp_get_workaround_address(struct blorp_batch *batch);
 
 static void
 blorp_alloc_binding_table(struct blorp_batch *batch, unsigned num_entries,
@@ -234,7 +234,7 @@ emit_urb_config(struct blorp_batch *batch,
    blorp_emit(batch, GENX(PIPE_CONTROL), pc) {
       pc.DepthStallEnable  = true;
       pc.PostSyncOperation = WriteImmediateData;
-      pc.Address           = blorp_get_workaround_page(batch);
+      pc.Address           = blorp_get_workaround_address(batch);
    }
 #endif
 
@@ -1698,7 +1698,7 @@ blorp_emit_depth_stencil_config(struct blorp_batch *batch,
     */
    blorp_emit(batch, GENX(PIPE_CONTROL), pc) {
       pc.PostSyncOperation = WriteImmediateData;
-      pc.Address = blorp_get_workaround_page(batch);
+      pc.Address = blorp_get_workaround_address(batch);
    }
 #endif
 }
@@ -1844,7 +1844,7 @@ blorp_emit_gen8_hiz_op(struct blorp_batch *batch,
     */
    blorp_emit(batch, GENX(PIPE_CONTROL), pc) {
       pc.PostSyncOperation = WriteImmediateData;
-      pc.Address = blorp_get_workaround_page(batch);
+      pc.Address = blorp_get_workaround_address(batch);
    }
 
 
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index cf94e0093d5..56a3c8868eb 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -179,7 +179,7 @@ blorp_vf_invalidate_for_vb_48b_transitions(struct blorp_batch *batch,
 }
 
 UNUSED static struct blorp_address
-blorp_get_workaround_page(struct blorp_batch *batch)
+blorp_get_workaround_address(struct blorp_batch *batch)
 {
    struct anv_cmd_buffer *cmd_buffer = batch->driver_batch;
 
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index 1d7f89e6c32..1889cdd8336 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -232,7 +232,7 @@ blorp_vf_invalidate_for_vb_48b_transitions(struct blorp_batch *batch,
 }
 
 UNUSED static struct blorp_address
-blorp_get_workaround_page(struct blorp_batch *batch)
+blorp_get_workaround_address(struct blorp_batch *batch)
 {
    assert(batch->blorp->driver_ctx == batch->driver_batch);
    struct brw_context *brw = batch->driver_batch;