From 72262ea15aeadfe6b2ce8d1fa7cd4930e2901e75 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 21 Feb 2017 21:38:46 +0100
Subject: [PATCH] Fix compiler issues on Windows

---
 panda/src/dxgsg9/dxIndexBufferContext9.cxx |  3 +--
 panda/src/gobj/geomVertexArrayData.I       | 11 ++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/panda/src/dxgsg9/dxIndexBufferContext9.cxx b/panda/src/dxgsg9/dxIndexBufferContext9.cxx
index 6cf6a78c84..fada562e55 100644
--- a/panda/src/dxgsg9/dxIndexBufferContext9.cxx
+++ b/panda/src/dxgsg9/dxIndexBufferContext9.cxx
@@ -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";
     }
   }
 }
diff --git a/panda/src/gobj/geomVertexArrayData.I b/panda/src/gobj/geomVertexArrayData.I
index 0c2b9904ea..6b29288f3b 100644
--- a/panda/src/gobj/geomVertexArrayData.I
+++ b/panda/src/gobj/geomVertexArrayData.I
@@ -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;
 }