diff options
| author | Ian Romanick <[email protected]> | 2013-01-21 22:41:13 -0500 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-01-25 09:07:34 -0500 |
| commit | 141e9d42f518fb113dcaf01fcb0c82b14726ebd6 (patch) | |
| tree | a6c7ad21707060d1db13fedaf3d5b488d0e1dadd /src/mesa | |
| parent | 6a0c1bc16334b72de25e57d0c7e0a72dcd7c5ecf (diff) | |
glsl: Modify uniform_field_visitor::visit_field to take a row_major parameter
Not used yet, but the UBO layout visitor will use this.
v2: Remove a spruious hunk. This is moved to the patch "glsl: Remove
ir_variable::uniform_block". Suggested by Carl Worth.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 03a1dc402c3..b197ad34437 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2389,7 +2389,8 @@ public: } private: - virtual void visit_field(const glsl_type *type, const char *name); + virtual void visit_field(const glsl_type *type, const char *name, + bool row_major); struct gl_shader_program *shader_program; struct gl_program_parameter_list *params; @@ -2397,10 +2398,13 @@ private: }; void -add_uniform_to_shader::visit_field(const glsl_type *type, const char *name) +add_uniform_to_shader::visit_field(const glsl_type *type, const char *name, + bool row_major) { unsigned int size; + (void) row_major; + if (type->is_vector() || type->is_scalar()) { size = type->vector_elements; } else { |