TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors when building with --override DO_PIPELINING=UNDEF

Browse Source
This commit is contained in:
rdb 2018-10-17 17:33:27 +02:00
parent 90c13cbd4e
commit 6488e46cc7
5 changed files with 86 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/gobj/geomVertexData.I
View File

@ -772,7 +772,9 @@ set_object(const GeomVertexData *object) {
_cdata = (GeomVertexData::CData *)_object->_cycler.read_unlocked(_current_thread); _cdata = (GeomVertexData::CData *)_object->_cycler.read_unlocked(_current_thread);
_got_array_readers = false; _got_array_readers = false;
#ifdef DO_PIPELINING
_cdata->ref(); _cdata->ref();
#endif // DO_PIPELINING
} }
/** /**

3
panda/src/pipeline/config_pipeline.cxx
View File

@ -71,7 +71,10 @@ init_libpipeline() {
} }
initialized = true; initialized = true;
#ifdef DO_PIPELINING
CycleData::init_type(); CycleData::init_type();
#endif
MainThread::init_type(); MainThread::init_type();
ExternalThread::init_type(); ExternalThread::init_type();
GenericThread::init_type(); GenericThread::init_type();

5
panda/src/pipeline/cycleData.h
View File

@ -50,10 +50,13 @@ class EXPCL_PANDA_PIPELINE CycleData
{ {
public: public:
INLINE CycleData() = default; INLINE CycleData() = default;
INLINE CycleData(CycleData &&from) = default; INLINE CycleData(CycleData &&from) noexcept = default;
INLINE CycleData(const CycleData &copy) = default; INLINE CycleData(const CycleData &copy) = default;
virtual ~CycleData(); virtual ~CycleData();
CycleData &operator = (CycleData &&from) noexcept = default;
CycleData &operator = (const CycleData &copy) = default;
virtual CycleData *make_copy() const=0; virtual CycleData *make_copy() const=0;
virtual void write_datagram(BamWriter *, Datagram &) const; virtual void write_datagram(BamWriter *, Datagram &) const;

51
panda/src/pipeline/cycleDataLockedStageReader.I
View File

@ -47,6 +47,20 @@ CycleDataLockedStageReader(const CycleDataLockedStageReader<CycleDataType> &copy
_cycler->increment_read(_pointer); _cycler->increment_read(_pointer);
} }
/**
*
*/
template<class CycleDataType>
INLINE CycleDataLockedStageReader<CycleDataType>::
CycleDataLockedStageReader(CycleDataLockedStageReader<CycleDataType> &&from) noexcept :
_cycler(from._cycler),
_current_thread(from._current_thread),
_pointer(from._pointer),
_stage(from._stage)
{
from._pointer = nullptr;
}
/** /**
* *
*/ */
@ -64,20 +78,6 @@ operator = (const CycleDataLockedStageReader<CycleDataType> &copy) {
_cycler->increment_read(_pointer); _cycler->increment_read(_pointer);
} }
/**
*
*/
template<class CycleDataType>
INLINE CycleDataLockedStageReader<CycleDataType>::
CycleDataLockedStageReader(CycleDataLockedStageReader<CycleDataType> &&from) noexcept :
_cycler(from._cycler),
_current_thread(from._current_thread),
_pointer(from._pointer),
_stage(from._stage)
{
from._pointer = nullptr;
}
/** /**
* *
*/ */
@ -174,6 +174,17 @@ CycleDataLockedStageReader(const CycleDataLockedStageReader<CycleDataType> &copy
{ {
} }
/**
*
*/
template<class CycleDataType>
INLINE CycleDataLockedStageReader<CycleDataType>::
CycleDataLockedStageReader(CycleDataLockedStageReader<CycleDataType> &&from) noexcept :
_pointer(from._cycler)
{
from._pointer = nullptr;
}
/** /**
* *
*/ */
@ -183,6 +194,18 @@ operator = (const CycleDataLockedStageReader<CycleDataType> &copy) {
_pointer = copy._pointer; _pointer = copy._pointer;
} }
/**
*
*/
template<class CycleDataType>
INLINE void CycleDataLockedStageReader<CycleDataType>::
operator = (CycleDataLockedStageReader<CycleDataType> &&from) noexcept {
nassertv(_pointer == nullptr);
_pointer = from._pointer;
from._pointer = nullptr;
}
/** /**
* *
*/ */

57
panda/src/pipeline/cycleDataStageWriter.I
View File

@ -62,23 +62,6 @@ CycleDataStageWriter(const CycleDataStageWriter<CycleDataType> &copy) :
_cycler->increment_write(_pointer); _cycler->increment_write(_pointer);
} }
/**
*
*/
template<class CycleDataType>
INLINE void CycleDataStageWriter<CycleDataType>::
operator = (const CycleDataStageWriter<CycleDataType> &copy) {
nassertv(_pointer == nullptr);
nassertv(_current_thread == copy._current_thread);
_cycler = copy._cycler;
_pointer = copy._pointer;
_stage = copy._stage;
nassertv(_pointer != nullptr);
_cycler->increment_write(_pointer);
}
/** /**
* This flavor of the constructor elevates the pointer from the * This flavor of the constructor elevates the pointer from the
* CycleDataLockedStageReader from a read to a write pointer (and invalidates * CycleDataLockedStageReader from a read to a write pointer (and invalidates
@ -128,6 +111,23 @@ CycleDataStageWriter(CycleDataStageWriter<CycleDataType> &&from) noexcept :
from._pointer = nullptr; from._pointer = nullptr;
} }
/**
*
*/
template<class CycleDataType>
INLINE void CycleDataStageWriter<CycleDataType>::
operator = (const CycleDataStageWriter<CycleDataType> &copy) {
nassertv(_pointer == nullptr);
nassertv(_current_thread == copy._current_thread);
_cycler = copy._cycler;
_pointer = copy._pointer;
_stage = copy._stage;
nassertv(_pointer != nullptr);
_cycler->increment_write(_pointer);
}
/** /**
* *
*/ */
@ -227,6 +227,17 @@ CycleDataStageWriter(const CycleDataStageWriter<CycleDataType> &copy) :
{ {
} }
/**
*
*/
template<class CycleDataType>
INLINE CycleDataStageWriter<CycleDataType>::
CycleDataStageWriter(CycleDataStageWriter<CycleDataType> &&from) noexcept :
_pointer(from._pointer)
{
from._pointer = nullptr;
}
/** /**
* *
*/ */
@ -236,6 +247,18 @@ operator = (const CycleDataStageWriter<CycleDataType> &copy) {
_pointer = copy._pointer; _pointer = copy._pointer;
} }
/**
*
*/
template<class CycleDataType>
INLINE void CycleDataStageWriter<CycleDataType>::
operator = (CycleDataStageWriter<CycleDataType> &&from) noexcept {
nassertv(_pointer == nullptr);
_pointer = from._pointer;
from._pointer = nullptr;
}
/** /**
* This flavor of the constructor elevates the pointer from the * This flavor of the constructor elevates the pointer from the
* CycleDataLockedStageReader from a read to a write pointer (and invalidates * CycleDataLockedStageReader from a read to a write pointer (and invalidates