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 compiler issues on Windows

This commit is contained in:
rdb 2017-02-21 21:38:46 +01:00
parent 8ec4da2824
commit 72262ea15a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/dxgsg9/dxIndexBufferContext9.cxx
View File

@ -132,8 +132,7 @@ allocate_ibuffer(DXScreenData &scrn,
dxgsg9_cat.debug()
<< "creating index buffer " << _ibuffer << ": "
<< reader->get_num_vertices() << " indices ("
<< reader->get_vertices_reader()->get_array_format()->get_column(0)->get_numeric_type()
<< ")\n";
<< reader->get_index_type() << ")\n";
}
}
}

11
panda/src/gobj/geomVertexArrayData.I
View File

@ -131,10 +131,10 @@ get_modified() const {
*/
INLINE bool GeomVertexArrayData::
request_resident(Thread *current_thread) const {
#ifdef DO_PIPELINING
CPT(GeomVertexArrayData::CData) cdata = _cycler.read_unlocked(current_thread);
#else
const GeomVertexArrayData::CData *cdata = _cycler.read_unlocked(current_thread);
#ifdef DO_PIPELINING
cdata->ref();
#endif
cdata->_rw_lock.acquire();
@ -143,6 +143,11 @@ request_resident(Thread *current_thread) const {
bool is_resident = (cdata->_buffer.get_read_pointer(false) != nullptr);
cdata->_rw_lock.release();
#ifdef DO_PIPELINING
unref_delete((CycleData *)cdata);
#endif
return is_resident;
}