summaryrefslogtreecommitdiff
path: root/src/gallium/include/pipe/p_state.h
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-16 08:21:34 -0600
committerBrian Paul <brianp@vmware.com>2010-04-16 08:21:49 -0600
commit97831efdb02ad68c70602a5b3a68c024e49e5715 (patch)
treee22cee151fe4f2295b59f53437585e1e657274ef /src/gallium/include/pipe/p_state.h
parent826f55218879ff42207f3968fd4a89370c8ae460 (diff)
gallium: comments and whitespace fixes
Diffstat (limited to 'src/gallium/include/pipe/p_state.h')
-rw-r--r--src/gallium/include/pipe/p_state.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index d281d69ff2..24cb266c14 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -288,9 +288,6 @@ struct pipe_surface
};
-
-
-
/**
* A view into a texture that can be bound to a shader stage.
*/
@@ -309,6 +306,9 @@ struct pipe_sampler_view
};
+/**
+ * Subregion of 1D/2D/3D image resource.
+ */
struct pipe_box
{
unsigned x;
@@ -320,7 +320,9 @@ struct pipe_box
};
-
+/**
+ * A memory object/resource such as a vertex buffer or texture.
+ */
struct pipe_resource
{
struct pipe_reference reference;
@@ -334,13 +336,16 @@ struct pipe_resource
unsigned last_level:8; /**< Index of last mipmap level present/defined */
unsigned nr_samples:8; /**< for multisampled surfaces, nr of samples */
- unsigned _usage:8; /* PIPE_USAGE_x (not a bitmask) */
+ unsigned _usage:8; /**< PIPE_USAGE_x (not a bitmask) */
- unsigned bind; /* PIPE_BIND_x */
- unsigned flags; /* PIPE_RESOURCE_FLAG_x */
+ unsigned bind; /**< bitmask of PIPE_BIND_x */
+ unsigned flags; /**< bitmask of PIPE_RESOURCE_FLAG_x */
};
+/**
+ * Extra indexing info for (cube) texture resources.
+ */
struct pipe_subresource
{
unsigned face:16;
@@ -349,7 +354,7 @@ struct pipe_subresource
/**
- * Transfer object. For data transfer to/from a texture.
+ * Transfer object. For data transfer to/from a resource.
*/
struct pipe_transfer
{