diff options
| author | Roland Scheidegger <[email protected]> | 2014-08-30 04:58:58 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2014-09-09 01:44:05 +0200 |
| commit | 9405e15f51bfafa1afcc9f32a00da98f2de42877 (patch) | |
| tree | ed2e6cabeae0d3b174515fa654a5be0d3153c66f | |
| parent | a20cc2796f5d55e49956ac0bc5d61ca027eec7f9 (diff) | |
gallivm: (trivial) fix min / max variable names
Calling the variable min when it's really max and vice versa seems a bit
confusing.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_arit.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_arit.c b/src/gallium/auxiliary/gallivm/lp_bld_arit.c index 82eebfba241..8f3b5687752 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c @@ -205,17 +205,17 @@ lp_build_min_simple(struct lp_build_context *bld, nan_behavior != GALLIVM_NAN_BEHAVIOR_UNDEFINED && nan_behavior != GALLIVM_NAN_RETURN_OTHER_SECOND_NONNAN && nan_behavior != GALLIVM_NAN_RETURN_NAN_FIRST_NONNAN) { - LLVMValueRef isnan, max; - max = lp_build_intrinsic_binary_anylength(bld->gallivm, intrinsic, + LLVMValueRef isnan, min; + min = lp_build_intrinsic_binary_anylength(bld->gallivm, intrinsic, type, intr_size, a, b); if (nan_behavior == GALLIVM_NAN_RETURN_OTHER) { isnan = lp_build_isnan(bld, b); - return lp_build_select(bld, isnan, a, max); + return lp_build_select(bld, isnan, a, min); } else { assert(nan_behavior == GALLIVM_NAN_RETURN_NAN); isnan = lp_build_isnan(bld, a); - return lp_build_select(bld, isnan, a, max); + return lp_build_select(bld, isnan, a, min); } } else { return lp_build_intrinsic_binary_anylength(bld->gallivm, intrinsic, @@ -381,17 +381,17 @@ lp_build_max_simple(struct lp_build_context *bld, nan_behavior != GALLIVM_NAN_BEHAVIOR_UNDEFINED && nan_behavior != GALLIVM_NAN_RETURN_OTHER_SECOND_NONNAN && nan_behavior != GALLIVM_NAN_RETURN_NAN_FIRST_NONNAN) { - LLVMValueRef isnan, min; - min = lp_build_intrinsic_binary_anylength(bld->gallivm, intrinsic, + LLVMValueRef isnan, max; + max = lp_build_intrinsic_binary_anylength(bld->gallivm, intrinsic, type, intr_size, a, b); if (nan_behavior == GALLIVM_NAN_RETURN_OTHER) { isnan = lp_build_isnan(bld, b); - return lp_build_select(bld, isnan, a, min); + return lp_build_select(bld, isnan, a, max); } else { assert(nan_behavior == GALLIVM_NAN_RETURN_NAN); isnan = lp_build_isnan(bld, a); - return lp_build_select(bld, isnan, a, min); + return lp_build_select(bld, isnan, a, max); } } else { return lp_build_intrinsic_binary_anylength(bld->gallivm, intrinsic, |