Mesa (master): gallium/docs: fix up transfer description for 1d arrays, add cube map arrays
Roland Scheidegger
sroland at kemper.freedesktop.org
Fri Jun 7 19:15:30 UTC 2013
Module: Mesa
Branch: master
Commit: 0f4c08aea2da3bd808109d09dbcdc249d1fb6b74
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f4c08aea2da3bd808109d09dbcdc249d1fb6b74
Author: Roland Scheidegger <sroland at vmware.com>
Date: Fri Jun 7 20:54:54 2013 +0200
gallium/docs: fix up transfer description for 1d arrays, add cube map arrays
Transfers always use z/depth for layers no matter if it's a 1d or 2d array
texture, we don't follow OpenGL's crazyness there. Luckily this appears to
only be a doc bug, everyone doing the right thing already.
While here also document z/depth parameter for cube map arrays.
v2: fix typo spotted by Eric Anholt
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
src/gallium/docs/source/context.rst | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst
index 679772f..6a8238e 100644
--- a/src/gallium/docs/source/context.rst
+++ b/src/gallium/docs/source/context.rst
@@ -472,15 +472,14 @@ The box parameter to some of these functions defines a 1D, 2D or 3D
region of pixels. This is self-explanatory for 1D, 2D and 3D texture
targets.
-For PIPE_TEXTURE_1D_ARRAY, the box::y and box::height fields refer to the
-array dimension of the texture.
-
-For PIPE_TEXTURE_2D_ARRAY, the box::z and box::depth fields refer to the
-array dimension of the texture.
+For PIPE_TEXTURE_1D_ARRAY and PIPE_TEXTURE_2D_ARRAY, the box::z and box::depth
+fields refer to the array dimension of the texture.
For PIPE_TEXTURE_CUBE, the box:z and box::depth fields refer to the
faces of the cube map (z + depth <= 6).
+For PIPE_TEXTURE_CUBE_ARRAY, the box:z and box::depth fields refer to both
+the face and array dimension of the texture (face = z % 6, array = z / 6).
.. _transfer_flush_region:
More information about the mesa-commit
mailing list