Mesa (master): nvfx: fix fragprog word swapping on big-endian machines

[Ben Skeggs]

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

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Thu Dec 16 11:12:52 2010 +1000

nvfx: fix fragprog word swapping on big-endian machines

Signed-off-by: Ben Skeggs <bskeggs at redhat.com>

---

 src/gallium/drivers/nvfx/nvfx_fragprog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_fragprog.c b/src/gallium/drivers/nvfx/nvfx_fragprog.c
index 13e8bee..1740d72 100644
--- a/src/gallium/drivers/nvfx/nvfx_fragprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_fragprog.c
@@ -1189,12 +1189,12 @@ out_err:
 static inline void
 nvfx_fp_memcpy(void* dst, const void* src, size_t len)
 {
-#ifndef WORDS_BIGENDIAN
+#ifndef PIPE_ARCH_BIG_ENDIAN
 	memcpy(dst, src, len);
 #else
 	size_t i;
 	for(i = 0; i < len; i += 4) {
-		uint32_t v = (uint32_t*)((char*)src + i);
+		uint32_t v = *(uint32_t*)((char*)src + i);
 		*(uint32_t*)((char*)dst + i) = (v >> 16) | (v << 16);
 	}
 #endif