Merge branch 'gallium-tex-surface' into gallium-0.1

Conflicts: src/gallium/include/pipe/p_util.h
2008-05-26 13:04:25 +02:00
parent 359058e7b7 7fbb61eedd
commit e3ddafd1d3
61 changed files with 10854 additions and 746 deletions
--- 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))

 /**