Mesa (master): i965/blorp: Move exec() out of brw_blorp_params.
Paul Berry
stereotype441 at kemper.freedesktop.org
Tue May 15 22:28:02 UTC 2012
Module: Mesa
Branch: master
Commit: 6335e0b0738a6e466f0b712e30ad9fe506f67a6c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6335e0b0738a6e466f0b712e30ad9fe506f67a6c
Author: Paul Berry <stereotype441 at gmail.com>
Date: Tue May 15 07:29:26 2012 -0700
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 at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_blorp.cpp | 6 +++---
src/mesa/drivers/dri/i965/brw_blorp.h | 7 +++++--
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index 8e22511..994d646 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 f14a5c7..65662c0 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 1f0c318..ad31f40 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, ¶ms);
/* Mark the dst buffer as needing a HiZ resolve if necessary. */
intel_renderbuffer_set_needs_hiz_resolve(dst_irb);
More information about the mesa-commit
mailing list