diff options
| author | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-09-15 21:04:18 +0000 |
|---|---|---|
| committer | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-09-15 21:04:18 +0000 |
| commit | f8edffb43f6b183291c1218c59c24d4b454cf4c5 (patch) | |
| tree | a43da7f586ea95d4e9ed96d3c35e24e809d0fc6c /framework | |
| parent | 317f467fac032b88a4789e4345421f92c4e8716d (diff) | |
| parent | e6ac923b4b105e400f37715aff16f467122621b7 (diff) | |
| download | deqp-f8edffb43f6b183291c1218c59c24d4b454cf4c5.tar.gz | |
Merge vk-gl-cts/opengl-es-cts-3.2.7 into vk-gl-cts/opengl-es-cts-3.2.8
Change-Id: I583b180f82fbb1c9af9a0ddec49f94c84785dc1f
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/common/tcuThreadUtil.cpp | 2 | ||||
| -rw-r--r-- | framework/delibs/decpp/deSpinBarrier.cpp | 16 | ||||
| -rw-r--r-- | framework/randomshaders/rsgExecutionContext.hpp | 5 | ||||
| -rw-r--r-- | framework/referencerenderer/rrFragmentPacket.hpp | 5 |
4 files changed, 11 insertions, 17 deletions
diff --git a/framework/common/tcuThreadUtil.cpp b/framework/common/tcuThreadUtil.cpp index 4ee3b338a..6a0567ac8 100644 --- a/framework/common/tcuThreadUtil.cpp +++ b/framework/common/tcuThreadUtil.cpp @@ -61,7 +61,7 @@ Event::Result Event::waitReady (void) m_lock.lock(); if (m_result == RESULT_NOT_READY) - m_waiterCount++; + m_waiterCount = m_waiterCount + 1; else { m_lock.unlock(); diff --git a/framework/delibs/decpp/deSpinBarrier.cpp b/framework/delibs/decpp/deSpinBarrier.cpp index e328abc2b..8111a35cd 100644 --- a/framework/delibs/decpp/deSpinBarrier.cpp +++ b/framework/delibs/decpp/deSpinBarrier.cpp @@ -102,12 +102,12 @@ void SpinBarrier::sync (WaitMode requestedMode) { // Release all waiting threads. Since this thread has not been removed, m_numLeaving will // be >= 1 until m_numLeaving is decremented at the end of this function. - m_numThreads -= m_numRemoved; - m_numLeaving = m_numThreads; - m_numRemoved = 0; + m_numThreads = m_numThreads - m_numRemoved; + m_numLeaving = m_numThreads; + m_numRemoved = 0; deMemoryReadWriteFence(); - m_numEntered = 0; + m_numEntered = 0; } else { @@ -148,12 +148,12 @@ void SpinBarrier::removeThread (WaitMode requestedMode) if (deAtomicIncrement32(&m_numEntered) == cachedNumThreads) { // Release all waiting threads. - m_numThreads -= m_numRemoved; - m_numLeaving = m_numThreads; - m_numRemoved = 0; + m_numThreads = m_numThreads - m_numRemoved; + m_numLeaving = m_numThreads; + m_numRemoved = 0; deMemoryReadWriteFence(); - m_numEntered = 0; + m_numEntered = 0; } } diff --git a/framework/randomshaders/rsgExecutionContext.hpp b/framework/randomshaders/rsgExecutionContext.hpp index b83c5d6c8..1df940d7b 100644 --- a/framework/randomshaders/rsgExecutionContext.hpp +++ b/framework/randomshaders/rsgExecutionContext.hpp @@ -34,10 +34,7 @@ namespace rsg { -enum -{ - EXEC_VEC_WIDTH = 64 -}; +constexpr int EXEC_VEC_WIDTH = 64; typedef ConstStridedValueAccess<EXEC_VEC_WIDTH> ExecConstValueAccess; typedef StridedValueAccess<EXEC_VEC_WIDTH> ExecValueAccess; diff --git a/framework/referencerenderer/rrFragmentPacket.hpp b/framework/referencerenderer/rrFragmentPacket.hpp index 688af752e..13df23fcb 100644 --- a/framework/referencerenderer/rrFragmentPacket.hpp +++ b/framework/referencerenderer/rrFragmentPacket.hpp @@ -29,10 +29,7 @@ namespace rr { -enum -{ - NUM_FRAGMENTS_PER_PACKET = 4 -}; +constexpr int NUM_FRAGMENTS_PER_PACKET = 4; /*--------------------------------------------------------------------*//*! * \brief Fragment packet |