Populate pLastIndex, even for the non-indexed case. A zero pLastIndex can cause the index offsets inside the fetcher to have non-sensical values that can be either very large positive or very large negative numbers.
v2 remove cc mesa-stable, since the stable patch needs to be different from this one (surrounding context is different), and has to be taken care of separately. --- src/gallium/drivers/swr/rasterizer/core/frontend.cpp | 15 +++++++++++++++ src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp index 1c4b522..c2be5d7 100644 --- a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp +++ b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp @@ -1719,6 +1719,21 @@ void ProcessDraw( if (i < endVertex) { + if (!IsIndexedT::value) + { + fetchInfo_lo.pLastIndex = fetchInfo_lo.pIndices; + uint32_t offset; + offset = std::min(endVertex-i, (uint32_t) KNOB_SIMD16_WIDTH); +#if USE_SIMD16_SHADERS + fetchInfo_lo.pLastIndex += offset; +#else + fetchInfo_lo.pLastIndex += std::min(offset, (uint32_t) KNOB_SIMD_WIDTH); + uint32_t offset2 = std::min(offset, (uint32_t) KNOB_SIMD16_WIDTH)-KNOB_SIMD_WIDTH; + assert(offset >= 0); + fetchInfo_hi.pLastIndex = fetchInfo_hi.pIndices; + fetchInfo_hi.pLastIndex += offset2; +#endif + } // 1. Execute FS/VS for a single SIMD. RDTSC_BEGIN(FEFetchShader, pDC->drawId); #if USE_SIMD16_SHADERS diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp index 880aaf8..68bd4c1 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp @@ -1881,7 +1881,7 @@ Value* FetchJit::GetSimdValid32bitIndices(Value* pIndices, Value* pLastIndex) // vIndexMask -1-1-1-1 0 0 0 0 : offsets < max pass // vLoadedIndices 0 1 2 3 0 0 0 0 : offsets >= max masked to 0 Value* vMaxIndex = VBROADCAST(numIndicesLeft); - Value* vIndexMask = VPCMPGTD(vMaxIndex,vIndexOffsets); + Value* vIndexMask = VPCMPGTD(vMaxIndex, vIndexOffsets); // VMASKLOAD takes an *i8 src pointer pIndices = BITCAST(pIndices,PointerType::get(mInt8Ty,0)); -- 2.7.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev