summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/tgsi/core/tgsi_util.c
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-07-24 09:17:59 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-07-24 09:17:59 -0600
commit5b737b7df21b418c71f71af987a20c495b1133f8 (patch)
tree6aa3a54cb5d3c43f789488147f3b61b56e09c5fc /src/mesa/pipe/tgsi/core/tgsi_util.c
parentf0636d9653d142bdf71475d2d2066f5c7c436978 (diff)
parent98eaf5503d0d7c4f18fab6910a08aba7a3d08639 (diff)
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/pipe/tgsi/core/tgsi_util.c')
-rw-r--r--src/mesa/pipe/tgsi/core/tgsi_util.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mesa/pipe/tgsi/core/tgsi_util.c b/src/mesa/pipe/tgsi/core/tgsi_util.c
index 2331affdfd..38d6d6e6bc 100644
--- a/src/mesa/pipe/tgsi/core/tgsi_util.c
+++ b/src/mesa/pipe/tgsi/core/tgsi_util.c
@@ -1,15 +1,22 @@
#include "tgsi_platform.h"
#include "tgsi_core.h"
+union pointer_hack
+{
+ void *pointer;
+ unsigned long long uint64;
+};
+
void *
tgsi_align_128bit(
void *unaligned )
{
- GLuint *ptr, addr;
+ union pointer_hack ph;
- ptr = (GLuint *) unaligned;
- addr = (*(GLuint *) &ptr + 15) & ~15;
- return *(void **) &addr;
+ ph.uint64 = 0;
+ ph.pointer = unaligned;
+ ph.uint64 = (ph.uint64 + 15) & ~15;
+ return ph.pointer;
}
GLuint