On 04/09/2013 10:38 AM, Eric Anholt wrote:
Ian Romanick <i...@freedesktop.org> writes:From: Ian Romanick <ian.d.roman...@intel.com> Now ir_dereference_array of a vector will never occur in the RHS of an expression. Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> --- src/glsl/ast_array_index.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp index 862f64c..e7bc299 100644 --- a/src/glsl/ast_array_index.cpp +++ b/src/glsl/ast_array_index.cpp @@ -31,17 +31,13 @@ _mesa_ast_array_index_to_hir(void *mem_ctx, ir_rvalue *array, ir_rvalue *idx, YYLTYPE &loc, YYLTYPE &idx_loc) { - ir_rvalue *result = new(mem_ctx) ir_dereference_array(array, idx); - if (!array->type->is_error() && !array->type->is_array() && !array->type->is_matrix() - && !array->type->is_vector()) { + && !array->type->is_vector()) _mesa_glsl_error(& idx_loc, state, "cannot dereference non-array / non-matrix / " "non-vector"); - result->type = glsl_type::error_type; - }Style-wise, I'd prefer those curly braces stay -- there's very little distinguishing the if condition from the body, already.
That's fair. I prefer that in general, but I thought the coding convention was to not include unnecessary { }... maybe that's just Kristian's convention.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
