Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / auxiliary / util / u_box.h

diff --git a/src/gallium/auxiliary/util/u_box.h b/src/gallium/auxiliary/util/u_box.h
index 919967b55a709ccea5be48381d1e317097ee76c0..0b28d0f12c3530cde20aaa3bdc09d0a8af81e51b 100644 (file)
--- a/src/gallium/auxiliary/util/u_box.h
+++ b/src/gallium/auxiliary/util/u_box.h
@@ -61,13 +61,20 @@ void u_box_2d_zslice( unsigned x,
 }
 
 static INLINE
-struct pipe_subresource u_subresource( unsigned face,
-                                      unsigned level )
+void u_box_3d( unsigned x,
+              unsigned y,
+              unsigned z,
+              unsigned w,
+              unsigned h,
+              unsigned d,
+              struct pipe_box *box )
 {
-   struct pipe_subresource subresource;
-   subresource.face = face;
-   subresource.level = level;
-   return subresource;
+   box->x = x;
+   box->y = y;
+   box->z = z;
+   box->width = w;
+   box->height = h;
+   box->depth = d;
 }
 
 #endif