Mesa (7.11): ir_to_mesa: Copy reladdr in src_reg(dst_reg) constructor

Ian Romanick idr at kemper.freedesktop.org
Thu Jul 28 18:48:47 UTC 2011


Module: Mesa
Branch: 7.11
Commit: 8b41ae0b2a9d283098334d2ec9b7d73f8ed339c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b41ae0b2a9d283098334d2ec9b7d73f8ed339c9

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Sun Jul 17 23:35:26 2011 -0700

ir_to_mesa: Copy reladdr in src_reg(dst_reg) constructor

Fixes i965 piglit:

    vs-temp-array-mat[234]-col-row-wr
    vs-temp-array-mat[234]-index-col-row-wr
    vs-temp-array-mat[234]-index-row-wr
    vs-temp-mat[234]-col-row-wr

Fixes swrast piglit:

    fs-temp-array-mat[234]-col-row-wr
    fs-temp-array-mat[234]-index-col-row-wr
    fs-temp-array-mat[234]-index-row-wr
    fs-temp-mat[234]-col-row-wr
    vs-temp-array-mat[234]-col-row-wr
    vs-temp-array-mat[234]-index-col-row-wr
    vs-temp-array-mat[234]-index-row-wr
    vs-temp-mat[234]-col-row-wr

Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit f7cd9a858c043e609fcdbf9ac9dfc1ef7ad002bf)

---

 src/mesa/program/ir_to_mesa.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 41b9bb9..9756ed9 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -134,7 +134,7 @@ src_reg::src_reg(dst_reg reg)
    this->index = reg.index;
    this->swizzle = SWIZZLE_XYZW;
    this->negate = 0;
-   this->reladdr = NULL;
+   this->reladdr = reg.reladdr;
 }
 
 dst_reg::dst_reg(src_reg reg)




More information about the mesa-commit mailing list