diff options
| author | Jakob Bornecrantz <[email protected]> | 2008-05-26 13:04:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2008-05-26 13:04:25 +0200 |
| commit | e3ddafd1d32192f4638d4930627ad66624325561 (patch) | |
| tree | d538b76af6c559593c6507ad7c2eb415d1b28c75 /src/gallium/include/pipe | |
| parent | 359058e7b77ddbac5eec7e8d1c77232bcbb1adbf (diff) | |
| parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) | |
Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:
src/gallium/include/pipe/p_util.h
Diffstat (limited to 'src/gallium/include/pipe')
| -rw-r--r-- | src/gallium/include/pipe/p_util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h index 0d8ed167b2a..597354ca96c 100644 --- a/src/gallium/include/pipe/p_util.h +++ b/src/gallium/include/pipe/p_util.h @@ -207,7 +207,6 @@ mem_dup(const void *src, uint size) #ifndef Elements #define Elements(x) (sizeof(x)/sizeof((x)[0])) #endif - #define Offset(TYPE, MEMBER) ((unsigned)&(((TYPE *)NULL)->MEMBER)) /** |