diff options
author | marha <marha@users.sourceforge.net> | 2011-03-13 21:22:39 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-13 21:22:39 +0000 |
commit | 6a16283d10f9d0ade43528b537c8ac68ad571bc1 (patch) | |
tree | b5e0b46175a22bd690c180e27d8c37886d84b32f /mesalib/src/glsl | |
parent | e0058f158bae56c5a10cad4f9ace808a27022a9d (diff) | |
parent | b5d1fd89898edb34f73679b542c754d837d44cf8 (diff) | |
download | vcxsrv-6a16283d10f9d0ade43528b537c8ac68ad571bc1.tar.gz vcxsrv-6a16283d10f9d0ade43528b537c8ac68ad571bc1.tar.bz2 vcxsrv-6a16283d10f9d0ade43528b537c8ac68ad571bc1.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl')
-rw-r--r-- | mesalib/src/glsl/glsl_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_types.h b/mesalib/src/glsl/glsl_types.h index 8efe12a00..e4c84c953 100644 --- a/mesalib/src/glsl/glsl_types.h +++ b/mesalib/src/glsl/glsl_types.h @@ -70,7 +70,7 @@ struct glsl_type { GLenum gl_type;
glsl_base_type base_type;
- unsigned sampler_dimensionality:3;
+ unsigned sampler_dimensionality:3; /**< \see glsl_sampler_dim */
unsigned sampler_shadow:1;
unsigned sampler_array:1;
unsigned sampler_type:2; /**< Type of data returned using this sampler.
|