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

Conflicts:

	src/gallium/include/pipe/p_util.h

diff --cc src/gallium/drivers/i915simple/i915_state.c
Simple merge

diff --cc src/gallium/include/pipe/p_util.h
Simple merge

diff --cc src/gallium/winsys/dri/intel/intel_winsys_pipe.c
index d15143a,6a42c79..10e1a84
--- 1/src/gallium/winsys/dri/intel/intel_winsys_pipe.c
--- 2/src/gallium/winsys/dri/intel/intel_winsys_pipe.c
+++ b/src/gallium/winsys/dri/intel/intel_winsys_pipe.c
@@@ -206,11 -220,10 +220,11 @@@ intel_i915_surface_alloc_storage(struc
                                   struct pipe_surface *surf,
                                   unsigned width, unsigned height,
                                   enum pipe_format format, 
 -                                 unsigned flags)
 +                                 unsigned flags,
 +                                 unsigned tex_usage)
  {
     const unsigned alignment = 64;
-    int ret;
+    //int ret;
  
     surf->width = width;
     surf->height = height;