diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:29:15 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:29:15 +0000 |
| commit | 7947b53aadd0abdcc0a79df8049cca583547ed9f (patch) | |
| tree | d1977e8c92fbca059b9f1f481da6affd56db9373 /lib/mesa | |
| parent | fd71bd3a5c3d6ccf684f2c52f1d47d4ada975771 (diff) | |
Import Mesa 13.0.2
Diffstat (limited to 'lib/mesa')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/swr/rasterizer/core/fifo.hpp | 4 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/drivers/swr/rasterizer/core/tilemgr.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/mesa/src/gallium/drivers/swr/rasterizer/core/fifo.hpp b/lib/mesa/src/gallium/drivers/swr/rasterizer/core/fifo.hpp index 49ba71f64..7e07e6aeb 100644 --- a/lib/mesa/src/gallium/drivers/swr/rasterizer/core/fifo.hpp +++ b/lib/mesa/src/gallium/drivers/swr/rasterizer/core/fifo.hpp @@ -109,8 +109,8 @@ struct QUEUE auto lambda = [&](int32_t i) { - __m256 vSrc = _mm256_load_ps(pSrc + i*KNOB_SIMD_WIDTH); - _mm256_stream_ps(pDst + i*KNOB_SIMD_WIDTH, vSrc); + __m256 vSrc = _simd_load_ps(pSrc + i*KNOB_SIMD_WIDTH); + _simd_stream_ps(pDst + i*KNOB_SIMD_WIDTH, vSrc); }; const uint32_t numSimdLines = sizeof(T) / (KNOB_SIMD_WIDTH*4); diff --git a/lib/mesa/src/gallium/drivers/swr/rasterizer/core/tilemgr.h b/lib/mesa/src/gallium/drivers/swr/rasterizer/core/tilemgr.h index 8f1cd2154..bfff339a5 100644 --- a/lib/mesa/src/gallium/drivers/swr/rasterizer/core/tilemgr.h +++ b/lib/mesa/src/gallium/drivers/swr/rasterizer/core/tilemgr.h @@ -151,7 +151,7 @@ private: OSALIGNLINE(volatile LONG) mWorkItemsConsumed { 0 }; }; -typedef void(*PFN_DISPATCH)(DRAW_CONTEXT* pDC, uint32_t workerId, uint32_t threadGroupId, void*& pSpillFillBuffer, void*& pScratchSpace); +typedef void(*PFN_DISPATCH)(DRAW_CONTEXT* pDC, uint32_t workerId, uint32_t threadGroupId, void*& pSpillFillBuffer); ////////////////////////////////////////////////////////////////////////// /// DispatchQueue - work queue for dispatch @@ -231,10 +231,10 @@ public: ////////////////////////////////////////////////////////////////////////// /// @brief Dispatches a unit of work - void dispatch(DRAW_CONTEXT* pDC, uint32_t workerId, uint32_t threadGroupId, void*& pSpillFillBuffer, void*& pScratchSpace) + void dispatch(DRAW_CONTEXT* pDC, uint32_t workerId, uint32_t threadGroupId, void*& pSpillFillBuffer) { SWR_ASSERT(mPfnDispatch != nullptr); - mPfnDispatch(pDC, workerId, threadGroupId, pSpillFillBuffer, pScratchSpace); + mPfnDispatch(pDC, workerId, threadGroupId, pSpillFillBuffer); } void* mpTaskData{ nullptr }; // The API thread will set this up and the callback task function will interpet this. |