RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation errors without threading

This commit is contained in:
David Rose 2006-05-02 01:47:59 +00:00
parent 7716080a27
commit 7dc0eabbbb
7 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/display/graphicsEngine.cxx
View File

@ -51,7 +51,7 @@
PStatCollector GraphicsEngine::_wait_pcollector("Wait:Thread sync");
PStatCollector GraphicsEngine::_cycle_pcollector("App:Cycle");
PStatCollector GraphicsEngine::_app_pcollector("App:Show code:General");
PStatCollector GraphicsEngine::_app_pcollector("App:xxx:General");
PStatCollector GraphicsEngine::_render_frame_pcollector("App:render_frame");
PStatCollector GraphicsEngine::_do_frame_pcollector("*:do_frame");
PStatCollector GraphicsEngine::_yield_pcollector("App:Yield");

4
panda/src/gobj/geom.h
View File

@ -352,7 +352,11 @@ public:
private:
const Geom *_object;
Thread *_current_thread;
#ifdef DO_PIPELINING
CPT(Geom::CData) _cdata;
#else
const Geom::CData *_cdata;
#endif // DO_PIPELINING
};
INLINE ostream &operator << (ostream &out, const Geom &obj);

5
panda/src/gobj/geomPrimitive.h
View File

@ -334,7 +334,12 @@ public:
private:
const GeomPrimitive *_object;
Thread *_current_thread;
#ifdef DO_PIPELINING
CPT(GeomPrimitive::CData) _cdata;
#else
const GeomPrimitive::CData *_cdata;
#endif // DO_PIPELINING
GeomVertexArrayDataPipelineReader *_vertices_reader;
};

4
panda/src/gobj/geomVertexArrayData.h
View File

@ -208,7 +208,11 @@ public:
protected:
GeomVertexArrayData *_object;
Thread *_current_thread;
#ifdef DO_PIPELINING
PT(GeomVertexArrayData::CData) _cdata;
#else
GeomVertexArrayData::CData *_cdata;
#endif // DO_PIPELINING
};
////////////////////////////////////////////////////////////////////

4
panda/src/gobj/geomVertexData.h
View File

@ -343,7 +343,11 @@ public:
protected:
GeomVertexData *_object;
Thread *_current_thread;
#ifdef DO_PIPELINING
PT(GeomVertexData::CData) _cdata;
#else
GeomVertexData::CData *_cdata;
#endif // DO_PIPELINING
};
////////////////////////////////////////////////////////////////////

5
panda/src/pgraph/pandaNode.h
View File

@ -673,7 +673,12 @@ public:
private:
const PandaNode *_object;
Thread *_current_thread;
#ifdef DO_PIPELINING
CPT(PandaNode::CData) _cdata;
#else
const PandaNode::CData *_cdata;
#endif // DO_PIPELINING
};
INLINE ostream &operator << (ostream &out, const PandaNode &node) {

18
panda/src/pipeline/pipelineCyclerDummyImpl.I
View File

@ -192,7 +192,7 @@ release_read(const CycleData *pointer) const {
// stage (but see elevate_read).
////////////////////////////////////////////////////////////////////
INLINE CycleData *PipelineCyclerDummyImpl::
write(Thread *) {
write(Thread *current_thread) {
TAU_PROFILE("CycleData *PipelineCyclerDummyImpl::write()", " ", TAU_USER);
_write_count++;
@ -252,10 +252,10 @@ write_upstream(bool, Thread *) {
// current stage.
////////////////////////////////////////////////////////////////////
INLINE CycleData *PipelineCyclerDummyImpl::
elevate_read(const CycleData *pointer, Thread *) {
elevate_read(const CycleData *pointer, Thread *current_thread) {
TAU_PROFILE("CycleData *PipelineCyclerDummyImpl::elevate_read(const CycleData *)", " ", TAU_USER);
release_read(pointer);
return write();
return write(current_thread);
}
////////////////////////////////////////////////////////////////////
@ -267,10 +267,10 @@ elevate_read(const CycleData *pointer, Thread *) {
// write_upstream().
////////////////////////////////////////////////////////////////////
INLINE CycleData *PipelineCyclerDummyImpl::
elevate_read_upstream(const CycleData *pointer, bool force_to_0, Thread *) {
elevate_read_upstream(const CycleData *pointer, bool force_to_0, Thread *current_thread) {
TAU_PROFILE("CycleData *PipelineCyclerDummyImpl::elevate_read_upstream(const CycleData *, bool)", " ", TAU_USER);
release_read(pointer);
return write_upstream(force_to_0);
return write_upstream(force_to_0, current_thread);
}
////////////////////////////////////////////////////////////////////
@ -416,11 +416,11 @@ write_stage_upstream(int pipeline_stage, bool, Thread *) {
// current stage.
////////////////////////////////////////////////////////////////////
INLINE CycleData *PipelineCyclerDummyImpl::
elevate_read_stage(int pipeline_stage, const CycleData *pointer, Thread *) {
elevate_read_stage(int pipeline_stage, const CycleData *pointer, Thread *current_thread) {
TAU_PROFILE("CycleData *PipelineCyclerDummyImpl::elevate_read_stage(int, CycleData *)", " ", TAU_USER);
nassertr(pipeline_stage == 0, NULL);
release_read(pointer);
return write();
return write(current_thread);
}
////////////////////////////////////////////////////////////////////
@ -434,11 +434,11 @@ elevate_read_stage(int pipeline_stage, const CycleData *pointer, Thread *) {
////////////////////////////////////////////////////////////////////
INLINE CycleData *PipelineCyclerDummyImpl::
elevate_read_stage_upstream(int pipeline_stage, const CycleData *pointer,
bool, Thread *) {
bool, Thread *current_thread) {
TAU_PROFILE("CycleData *PipelineCyclerDummyImpl::elevate_read_stage(int, CycleData *)", " ", TAU_USER);
nassertr(pipeline_stage == 0, NULL);
release_read(pointer);
return write();
return write(current_thread);
}
////////////////////////////////////////////////////////////////////