Mesa (master): glsl: Minor clean ups in constant_referenced
Ian Romanick
idr at kemper.freedesktop.org
Tue Mar 25 19:09:49 UTC 2014
Module: Mesa
Branch: master
Commit: f3ab987b70a011b8743941c893bb4e2475bbd79f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f3ab987b70a011b8743941c893bb4e2475bbd79f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Mar 12 15:30:59 2014 -0700
glsl: Minor clean ups in constant_referenced
These could probably be squashed into one of the previous commits.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
src/glsl/ir_constant_expression.cpp | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index ea9e84a..e4f8a58 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -408,41 +408,36 @@ constant_referenced(const ir_dereference *deref,
const ir_dereference_array *const da =
(const ir_dereference_array *) deref;
- ir_constant *index_c =
+ ir_constant *const index_c =
da->array_index->constant_expression_value(variable_context);
if (!index_c || !index_c->type->is_scalar() || !index_c->type->is_integer())
break;
- int index = index_c->type->base_type == GLSL_TYPE_INT ?
+ const int index = index_c->type->base_type == GLSL_TYPE_INT ?
index_c->get_int_component(0) :
index_c->get_uint_component(0);
ir_constant *substore;
int suboffset;
- const ir_dereference *deref = da->array->as_dereference();
+ const ir_dereference *const deref = da->array->as_dereference();
if (!deref)
break;
if (!constant_referenced(deref, variable_context, substore, suboffset))
break;
- const glsl_type *vt = da->array->type;
+ const glsl_type *const vt = da->array->type;
if (vt->is_array()) {
store = substore->get_array_element(index);
offset = 0;
- break;
- }
- if (vt->is_matrix()) {
+ } else if (vt->is_matrix()) {
store = substore;
offset = index * vt->vector_elements;
- break;
- }
- if (vt->is_vector()) {
+ } else if (vt->is_vector()) {
store = substore;
offset = suboffset + index;
- break;
}
break;
More information about the mesa-commit
mailing list