From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Mon, 26 May 2008 11:04:25 +0000 (+0200)
Subject: Merge branch 'gallium-tex-surface' into gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e3ddafd1d32192f4638d4930627ad66624325561;p=mesa.git

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

Conflicts:

	src/gallium/include/pipe/p_util.h
---

e3ddafd1d32192f4638d4930627ad66624325561
diff --cc src/gallium/winsys/dri/intel/intel_winsys_pipe.c
index d15143acfd4,6a42c790337..10e1a84cc12
--- a/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;