summaryrefslogtreecommitdiffstats
path: root/src/glsl/linker.h
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-01-21 22:32:07 -0500
committerIan Romanick <ian.d.romanick@intel.com>2013-01-25 09:07:34 -0500
commit6a0c1bc16334b72de25e57d0c7e0a72dcd7c5ecf (patch)
treec4bba8900777cc79d2082042b180e83de8bdfd68 /src/glsl/linker.h
parent23b7ce3a824013c8b4d7340294cb59b0b4cb8f87 (diff)
downloadexternal_mesa3d-6a0c1bc16334b72de25e57d0c7e0a72dcd7c5ecf.zip
external_mesa3d-6a0c1bc16334b72de25e57d0c7e0a72dcd7c5ecf.tar.gz
external_mesa3d-6a0c1bc16334b72de25e57d0c7e0a72dcd7c5ecf.tar.bz2
glsl: Modify uniform_field_visitor::recursion to take a row_major parameter
Not used yet, but the UBO layout visitor will use this. v2: Add some commentary as to why row_major is always set to false in process. Suggesed by Paul Berry. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Carl Worth <cworth@cworth.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl/linker.h')
-rw-r--r--src/glsl/linker.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/glsl/linker.h b/src/glsl/linker.h
index c8f3844..e69098a 100644
--- a/src/glsl/linker.h
+++ b/src/glsl/linker.h
@@ -75,6 +75,12 @@ public:
* \param var The uniform variable that is to be processed
*
* Calls \c ::visit_field for each leaf of the uniform.
+ *
+ * \warning
+ * This entry should only be used with uniform blocks in cases where the
+ * row / column ordering of matrices in the block does not matter. For
+ * example, enumerating the names of members of the block, but not for
+ * determining the offsets of members.
*/
void process(ir_variable *var);
@@ -92,7 +98,8 @@ private:
* \param name_length Length of the current name \b not including the
* terminating \c NUL character.
*/
- void recursion(const glsl_type *t, char **name, size_t name_length);
+ void recursion(const glsl_type *t, char **name, size_t name_length,
+ bool row_major);
};
void