KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swr: [rasterizer jitter] Fix issues with stream-out on llvm>=3.8 

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
Tim Rowley 2017-01-20 18:32:14 -06:00
parent 8423ad437b
commit d159b0bf34
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/swr/rasterizer/jitter/builder.cpp
View File

@ -56,8 +56,6 @@ namespace SwrJit
mInt16PtrTy = PointerType::get(mInt16Ty, 0);
mInt32PtrTy = PointerType::get(mInt32Ty, 0);
mInt64Ty = Type::getInt64Ty(pJitMgr->mContext);
mV4FP32Ty = StructType::get(pJitMgr->mContext, std::vector<Type*>(4, mFP32Ty), false); // vector4 float type (represented as structure)
mV4Int32Ty = StructType::get(pJitMgr->mContext, std::vector<Type*>(4, mInt32Ty), false); // vector4 int type
mSimdInt1Ty = VectorType::get(mInt1Ty, mVWidth);
mSimdInt16Ty = VectorType::get(mInt16Ty, mVWidth);
mSimdInt32Ty = VectorType::get(mInt32Ty, mVWidth);
@ -65,7 +63,7 @@ namespace SwrJit
mSimdFP16Ty = VectorType::get(mFP16Ty, mVWidth);
mSimdFP32Ty = VectorType::get(mFP32Ty, mVWidth);
mSimdVectorTy = ArrayType::get(mSimdFP32Ty, 4);
mSimdVectorTRTy = StructType::get(pJitMgr->mContext, std::vector<Type*>(5, mSimdFP32Ty), false);
mSimdVectorTRTy = ArrayType::get(mSimdFP32Ty, 5);
if (sizeof(uint32_t*) == 4)
{

2
src/gallium/drivers/swr/rasterizer/jitter/builder.h
View File

@ -69,8 +69,6 @@ namespace SwrJit
Type* mSimdIntPtrTy;
Type* mSimdVectorTy;
Type* mSimdVectorTRTy;
StructType* mV4FP32Ty;
StructType* mV4Int32Ty;
#include "builder_gen.h"
#include "builder_x86.h"

6
src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp
View File

@ -159,7 +159,11 @@ struct StreamOutJit : public Builder
// cast input to <4xfloat>
Value* src = BITCAST(vpackedAttrib, simd4Ty);
CALL(maskStore, {pOut, ToMask(packedMask), src});
// cast mask to <4xint>
Value* mask = ToMask(packedMask);
mask = BITCAST(mask, VectorType::get(IRB()->getInt32Ty(), 4));
CALL(maskStore, {pOut, mask, src});
}
// increment SO buffer