qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build with latest qtbase due to qsimd_p changes 

_bit_scan_forward is no more. Switch to qCountTrailingZeroBits which
in the end also boils down to _BitScanForward on MSVC.

Change-Id: Ic10ac2b0663c95c86be5414934105f5ec0bf1a9b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2016-06-01 12:22:12 +02:00
parent 1c6d4353f7
commit d40d3b4ee3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp
View File

@ -43,7 +43,7 @@
#include <QString>
#include <QColor>
#include <qmath.h>
#include <QtCore/private/qsimd_p.h>
#include <qalgorithms.h>
// Comment out to disable DeviceLossTester functionality in order to reduce
// code size and improve startup perf a tiny bit.
@ -92,7 +92,7 @@ D3D12_CPU_DESCRIPTOR_HANDLE QSGD3D12CPUDescriptorHeapManager::allocate(D3D12_DES
if (heap.type == type) {
for (int bucket = 0; bucket < _countof(heap.freeMap); ++bucket)
if (heap.freeMap[bucket]) {
unsigned long freePos = _bit_scan_forward(heap.freeMap[bucket]);
uint freePos = qCountTrailingZeroBits(heap.freeMap[bucket]);
heap.freeMap[bucket] &= ~(1UL << freePos);
if (Q_UNLIKELY(debug_render()))
qDebug("descriptor handle type %x reserve in bucket %d index %d", type, bucket, freePos);