projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
auxiliary
/
gallivm
/
lp_bld_pack.c
diff --git
a/src/gallium/auxiliary/gallivm/lp_bld_pack.c
b/src/gallium/auxiliary/gallivm/lp_bld_pack.c
index 4c61d1074948a2a40114a6ad63947f2cf7ac3d41..2daa8a3b58212114724062ad7be3d3647bba9877 100644
(file)
--- a/
src/gallium/auxiliary/gallivm/lp_bld_pack.c
+++ b/
src/gallium/auxiliary/gallivm/lp_bld_pack.c
@@
-164,7
+164,7
@@
lp_build_unpack2(LLVMBuilderRef builder,
if(dst_type.sign && src_type.sign) {
/* Replicate the sign bit in the most significant bits */
if(dst_type.sign && src_type.sign) {
/* Replicate the sign bit in the most significant bits */
- msb = LLVMBuildAShr(builder, src, lp_build_
int_const_scalar
(src_type, src_type.width - 1), "");
+ msb = LLVMBuildAShr(builder, src, lp_build_
const_int_vec
(src_type, src_type.width - 1), "");
}
else
/* Most significant bits always zero */
}
else
/* Most significant bits always zero */
@@
-256,7
+256,7
@@
lp_build_pack2(LLVMBuilderRef builder,
LLVMValueRef lo,
LLVMValueRef hi)
{
LLVMValueRef lo,
LLVMValueRef hi)
{
-#if
!(HAVE_LLVM >= 0x0207)
+#if
HAVE_LLVM < 0x0207
LLVMTypeRef src_vec_type = lp_build_vec_type(src_type);
#endif
LLVMTypeRef dst_vec_type = lp_build_vec_type(dst_type);
LLVMTypeRef src_vec_type = lp_build_vec_type(src_type);
#endif
LLVMTypeRef dst_vec_type = lp_build_vec_type(dst_type);
@@
-361,7
+361,7
@@
lp_build_packs2(LLVMBuilderRef builder,
if(clamp) {
struct lp_build_context bld;
unsigned dst_bits = dst_type.sign ? dst_type.width - 1 : dst_type.width;
if(clamp) {
struct lp_build_context bld;
unsigned dst_bits = dst_type.sign ? dst_type.width - 1 : dst_type.width;
- LLVMValueRef dst_max = lp_build_
int_const_scalar
(src_type, ((unsigned long long)1 << dst_bits) - 1);
+ LLVMValueRef dst_max = lp_build_
const_int_vec
(src_type, ((unsigned long long)1 << dst_bits) - 1);
lp_build_context_init(&bld, builder, src_type);
lo = lp_build_min(&bld, lo, dst_max);
hi = lp_build_min(&bld, hi, dst_max);
lp_build_context_init(&bld, builder, src_type);
lo = lp_build_min(&bld, lo, dst_max);
hi = lp_build_min(&bld, hi, dst_max);