diff options
author | Peter Kasting <pkasting@chromium.org> | 2022-09-08 19:00:54 +0000 |
---|---|---|
committer | Matthew Netsch <quic_mnetsch@quicinc.com> | 2022-09-14 18:25:08 +0000 |
commit | 87c2ea83160c012cbbac3b4ebc69d92e8ce7f627 (patch) | |
tree | 35adaa121090d028053f1d7e6e735093c2ce0214 | |
parent | 25d369621f87b71e507db8bff281b35438d2064a (diff) | |
download | deqp-87c2ea83160c012cbbac3b4ebc69d92e8ce7f627.tar.gz |
Fix build in C++20 mode.
* Compound assignments to volatiles are deprecated. Use non-compound
forms.
* Math between disparate enums is deprecated. Use constexprs.
* The full definition of a type T must be visible for code that
instantiates std::vector<T>. Reorder code to guarantee this.
Components: Framework
Bug: chromium:1284275
Change-Id: I75a99b5c09cc911f2312aabe85f49aadff84dc51
-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 | ||||
-rw-r--r-- | modules/glshared/glsBuiltinPrecisionTests.cpp | 54 |
5 files changed, 38 insertions, 44 deletions
diff --git a/framework/common/tcuThreadUtil.cpp b/framework/common/tcuThreadUtil.cpp index 964c2132f..cb1b47677 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 diff --git a/modules/glshared/glsBuiltinPrecisionTests.cpp b/modules/glshared/glsBuiltinPrecisionTests.cpp index 80c55203d..a4d784264 100644 --- a/modules/glshared/glsBuiltinPrecisionTests.cpp +++ b/modules/glshared/glsBuiltinPrecisionTests.cpp @@ -653,33 +653,6 @@ private: int m_count; }; -class ExpandContext -{ -public: - ExpandContext (Counter& symCounter) : m_symCounter(symCounter) {} - ExpandContext (const ExpandContext& parent) - : m_symCounter(parent.m_symCounter) {} - - template<typename T> - VariableP<T> genSym (const string& baseName) - { - return variable<T>(baseName + de::toString(m_symCounter())); - } - - void addStatement (const StatementP& stmt) - { - m_statements.push_back(stmt); - } - - vector<StatementP> getStatements (void) const - { - return m_statements; - } -private: - Counter& m_symCounter; - vector<StatementP> m_statements; -}; - /*--------------------------------------------------------------------*//*! * \brief A statement or declaration. * @@ -728,6 +701,33 @@ public: StatementP (const Super& ptr) : Super(ptr) {} }; +class ExpandContext +{ +public: + ExpandContext (Counter& symCounter) : m_symCounter(symCounter) {} + ExpandContext (const ExpandContext& parent) + : m_symCounter(parent.m_symCounter) {} + + template<typename T> + VariableP<T> genSym (const string& baseName) + { + return variable<T>(baseName + de::toString(m_symCounter())); + } + + void addStatement (const StatementP& stmt) + { + m_statements.push_back(stmt); + } + + vector<StatementP> getStatements (void) const + { + return m_statements; + } +private: + Counter& m_symCounter; + vector<StatementP> m_statements; +}; + /*--------------------------------------------------------------------*//*! * \brief * |