Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

Conflicts:

	configs/linux-dri
	src/mesa/pipe/Makefile

1 files changed, 0 insertions, 43 deletions

diff --git a/src/mesa/pipe/README.portability b/src/mesa/pipe/README.portability
deleted file mode 100644
index c70ca774da..0000000000
--- a/src/mesa/pipe/README.portability
+++ /dev/null
@@ -1,43 +0,0 @@
-	      CROSS-PLATFORM PORTABILITY GUIDELINES FOR GALLIUM3D 
-
-
-= General Considerations =
-
-The state tracker and winsys driver support a rather limited number of
-platforms. However, the pipe drivers are meant to run in a wide number of
-platforms. Hence the pipe drivers, the auxiliary modules, and all public
-headers in general, should stricly follow these guidelines to ensure
-
-
-= Compiler Support =
-
-* Include the p_compiler.h.
-
-* Don't use the 'inline' keyword, use the INLINE macro in p_compiler.h instead.
-
-* Cast explicitly when converting to integer types of smaller sizes.
-
-* Cast explicitly when converting between float, double and integral types.
-
-* Don't use named struct initializers.
-
-* Don't use variable number of macro arguments. Use static inline functions
-instead.
-
-
-= Standard Library =
-
-* Avoid including standard library headers. Most standard library functions are
-not available in Windows Kernel Mode. Use the appropriate p_*.h include.
-
-== Memory Allocation ==
-
-* Use MALLOC, CALLOC, FREE instead of the malloc, calloc, free functions.
-
-* Use align_pointer() function defined in p_util.h for aligning pointers in a
-portable way.
-
-== Debugging ==
-
-TODO
-