From: Paul Berry <stereotype441@gmail.com>
Date: Tue, 15 May 2012 14:29:26 +0000 (-0700)
Subject: i965/blorp: Move exec() out of brw_blorp_params.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6335e0b0738a6e466f0b712e30ad9fe506f67a6c;p=mesa.git

i965/blorp: Move exec() out of brw_blorp_params.

No functional change.  This patch replaces the
brw_blorp_params::exec() method with a global function
brw_blorp_exec() that performs the operation described by the params
data structure.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index 8e225117fab..994d646296c 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
@@ -99,14 +99,14 @@ brw_blorp_params::brw_blorp_params()
 }
 
 void
-brw_blorp_params::exec(struct intel_context *intel) const
+brw_blorp_exec(struct intel_context *intel, const brw_blorp_params *params)
 {
    switch (intel->gen) {
    case 6:
-      gen6_blorp_exec(intel, this);
+      gen6_blorp_exec(intel, params);
       break;
    case 7:
-      gen7_blorp_exec(intel, this);
+      gen7_blorp_exec(intel, params);
       break;
    default:
       /* BLORP is not supported before Gen6. */
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index f14a5c7aae0..65662c068f8 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -142,8 +142,6 @@ public:
    virtual uint32_t get_wm_prog(struct brw_context *brw,
                                 brw_blorp_prog_data **prog_data) const = 0;
 
-   void exec(struct intel_context *intel) const;
-
    uint32_t x0;
    uint32_t y0;
    uint32_t x1;
@@ -158,6 +156,11 @@ public:
    brw_blorp_wm_push_constants wm_push_consts;
 };
 
+
+void
+brw_blorp_exec(struct intel_context *intel, const brw_blorp_params *params);
+
+
 /**
  * Parameters for a HiZ or depth resolve operation.
  *
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index 1f0c3185394..ad31f4090e0 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -173,7 +173,7 @@ try_blorp_blit(struct intel_context *intel,
    brw_blorp_blit_params params(src_mt, dst_mt,
                                 srcX0, srcY0, dstX0, dstY0, dstX1, dstY1,
                                 mirror_x, mirror_y);
-   params.exec(intel);
+   brw_blorp_exec(intel, &params);
 
    /* Mark the dst buffer as needing a HiZ resolve if necessary. */
    intel_renderbuffer_set_needs_hiz_resolve(dst_irb);