Mesa (master): i965/cfg: Initialize cfg_t::cycle_count.

Matt Turner mattst88 at kemper.freedesktop.org
Tue Nov 29 19:58:14 UTC 2016


Module: Mesa
Branch: master
Commit: ca9e30e002db87946e93fe58118a740e6438d342
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca9e30e002db87946e93fe58118a740e6438d342

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Nov 28 13:24:04 2016 -0800

i965/cfg: Initialize cfg_t::cycle_count.

This reverts commit b4001af1744a02f472bd1204458662088307981b.

Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/mesa/drivers/dri/i965/brw_cfg.cpp | 1 +
 src/mesa/drivers/dri/i965/brw_cfg.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp
index 53b32be..ff2cf6a 100644
--- a/src/mesa/drivers/dri/i965/brw_cfg.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cfg.cpp
@@ -158,6 +158,7 @@ cfg_t::cfg_t(exec_list *instructions)
    blocks = NULL;
    num_blocks = 0;
    idom_dirty = true;
+   cycle_count = 0;
 
    bblock_t *cur = NULL;
    int ip = 0;
diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h b/src/mesa/drivers/dri/i965/brw_cfg.h
index ec21ae7..b8af40f 100644
--- a/src/mesa/drivers/dri/i965/brw_cfg.h
+++ b/src/mesa/drivers/dri/i965/brw_cfg.h
@@ -274,7 +274,7 @@ bblock_t::last_non_control_flow_inst()
 
 struct cfg_t {
 #ifdef __cplusplus
-   DECLARE_RZALLOC_CXX_OPERATORS(cfg_t)
+   DECLARE_RALLOC_CXX_OPERATORS(cfg_t)
 
    cfg_t(exec_list *instructions);
    ~cfg_t();




More information about the mesa-commit mailing list