Convert to new interfaces so that it will compile
Convert TRUE and FALSE to true and false. Convert _mesa_ast_get_location to ast_node::get_location.
This commit is contained in:
@@ -84,7 +84,7 @@ generate_swizzle(const char *str, struct ir_swizzle_mask *swiz,
|
|||||||
* index value as described above.
|
* index value as described above.
|
||||||
*/
|
*/
|
||||||
if ((str[0] < 'a') || (str[0] > 'z'))
|
if ((str[0] < 'a') || (str[0] > 'z'))
|
||||||
return FALSE;
|
return false;
|
||||||
|
|
||||||
base = base_idx[str[0] - 'a'];
|
base = base_idx[str[0] - 'a'];
|
||||||
|
|
||||||
@@ -96,11 +96,11 @@ generate_swizzle(const char *str, struct ir_swizzle_mask *swiz,
|
|||||||
* swizzle index.
|
* swizzle index.
|
||||||
*/
|
*/
|
||||||
if ((str[i] < 'a') || (str[i] > 'z'))
|
if ((str[i] < 'a') || (str[i] > 'z'))
|
||||||
return FALSE;
|
return false;
|
||||||
|
|
||||||
swiz_idx[i] = idx_map[str[0] - 'a'] - base;
|
swiz_idx[i] = idx_map[str[0] - 'a'] - base;
|
||||||
if ((swiz_idx[i] < 0) || (swiz_idx[i] >= (int) vector_length))
|
if ((swiz_idx[i] < 0) || (swiz_idx[i] >= (int) vector_length))
|
||||||
return FALSE;
|
return false;
|
||||||
|
|
||||||
|
|
||||||
/* Track a bit-mask of the swizzle index values that have been seen. If
|
/* Track a bit-mask of the swizzle index values that have been seen. If
|
||||||
@@ -112,7 +112,7 @@ generate_swizzle(const char *str, struct ir_swizzle_mask *swiz,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (str[i] != '\0')
|
if (str[i] != '\0')
|
||||||
return FALSE;
|
return false;
|
||||||
|
|
||||||
swiz->x = swiz_idx[0];
|
swiz->x = swiz_idx[0];
|
||||||
swiz->y = swiz_idx[1];
|
swiz->y = swiz_idx[1];
|
||||||
@@ -121,7 +121,7 @@ generate_swizzle(const char *str, struct ir_swizzle_mask *swiz,
|
|||||||
swiz->num_components = i;
|
swiz->num_components = i;
|
||||||
swiz->has_duplicates = (dup_mask != 0);
|
swiz->has_duplicates = (dup_mask != 0);
|
||||||
|
|
||||||
return TRUE;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -155,7 +155,7 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
|
|||||||
* by the base type of the thing to which the field selection operator is
|
* by the base type of the thing to which the field selection operator is
|
||||||
* being applied.
|
* being applied.
|
||||||
*/
|
*/
|
||||||
_mesa_ast_get_location(expr, & loc);
|
loc = expr->get_location();
|
||||||
if (is_glsl_type_vector(op->type)) {
|
if (is_glsl_type_vector(op->type)) {
|
||||||
if (generate_swizzle(expr->primary_expression.identifier,
|
if (generate_swizzle(expr->primary_expression.identifier,
|
||||||
& deref->selector.swizzle,
|
& deref->selector.swizzle,
|
||||||
|
Reference in New Issue
Block a user