fix stupid compilation errors

panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx

@@ -3421,7 +3421,8 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
     release_all_vertex_buffers();
     release_all_index_buffers();
 
-    _prepared_objects->begin_frame(this);
+    Thread *current_thread = Thread::get_current_thread();
+    _prepared_objects->begin_frame(this, current_thread);
 
     hr = _d3d_device->Reset(&_presentation_reset);
     if (FAILED(hr)) {
@@ -3479,7 +3480,7 @@ check_cooperative_level() {
     _dx_is_ready = false;
 
     // call this just in case
-    _prepared_objects->begin_frame(this);
+    _prepared_objects->begin_frame(this, Thread::get_current_thread());
 
     hr = reset_d3d_device(&_screen->_presentation_params);
     if (FAILED(hr)) {

panda/src/dxgsg8/dxGraphicsStateGuardian8.h

@@ -71,10 +71,10 @@ public:
   virtual CPT(TransformState) calc_projection_mat(const Lens *lens);
   virtual bool prepare_lens();
 
-  virtual bool begin_frame(Thread *current_thread, Thread *current_thread);
-  virtual bool begin_scene(Thread *current_thread, Thread *current_thread);
+  virtual bool begin_frame(Thread *current_thread);
+  virtual bool begin_scene();
   virtual void end_scene();
-  virtual void end_frame();
+  virtual void end_frame(Thread *current_thread);
 
   virtual bool begin_draw_primitives(const GeomPipelineReader *geom_reader, 
                                      const GeomMunger *munger,

panda/src/dxgsg8/wdxGraphicsWindow8.cxx

@@ -113,7 +113,7 @@ begin_frame(FrameMode mode, Thread *current_thread) {
 //               should do whatever finalization is required.
 ////////////////////////////////////////////////////////////////////
 void wdxGraphicsWindow8::
-end_frame(FrameMode mode) {
+end_frame(FrameMode mode, Thread *current_thread) {
 
   end_frame_spam();
   nassertv(_gsg != (GraphicsStateGuardian *)NULL);
@@ -122,7 +122,7 @@ end_frame(FrameMode mode) {
     copy_to_textures();
   }
 
-  _gsg->end_frame();
+  _gsg->end_frame(current_thread);
 
   if (mode == FM_render) {
     trigger_flip();

panda/src/dxgsg8/wdxGraphicsWindow8.h

@@ -42,8 +42,8 @@ public:
                      GraphicsOutput *host);
   virtual ~wdxGraphicsWindow8();
 
-  virtual bool begin_frame(FrameMode mode);
-  virtual void end_frame(FrameMode mode);
+  virtual bool begin_frame(FrameMode mode, Thread *current_thread);
+  virtual void end_frame(FrameMode mode, Thread *current_thread);
   virtual void end_flip();
 
   virtual int verify_window_sizes(int numsizes, int *dimen);

panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx

@@ -4486,7 +4486,8 @@ reset_d3d_device(D3DPRESENT_PARAMETERS *presentation_params,
     release_all_index_buffers();
 
     // must be called before reset
-    _prepared_objects->begin_frame(this);
+    Thread *current_thread = Thread::get_current_thread();
+    _prepared_objects->begin_frame(this, current_thread);
 
     hr = _d3d_device->Reset(&_presentation_reset);
     if (FAILED(hr)) {
@@ -4544,7 +4545,7 @@ check_cooperative_level() {
     _dx_is_ready = false;
 
     // call this just in case
-    _prepared_objects->begin_frame(this);
+    _prepared_objects->begin_frame(this, Thread::get_current_thread());
 
     hr = reset_d3d_device(&_screen->_presentation_params);
     if (FAILED(hr)) {

panda/src/dxgsg9/dxGraphicsStateGuardian9.h

@@ -107,10 +107,10 @@ public:
   virtual CPT(TransformState) calc_projection_mat(const Lens *lens);
   virtual bool prepare_lens();
 
-  virtual bool begin_frame(Thread *current_thread, Thread *current_thread);
-  virtual bool begin_scene(Thread *current_thread, Thread *current_thread);
+  virtual bool begin_frame(Thread *current_thread);
+  virtual bool begin_scene();
   virtual void end_scene();
-  virtual void end_frame();
+  virtual void end_frame(Thread *current_thread);
 
   virtual bool begin_draw_primitives(const GeomPipelineReader *geom_reader, 
                                      const GeomMunger *munger,

panda/src/dxgsg9/wdxGraphicsWindow9.h

@@ -42,8 +42,8 @@ public:
                      GraphicsOutput *host);
   virtual ~wdxGraphicsWindow9();
 
-  virtual bool begin_frame(FrameMode mode);
-  virtual void end_frame(FrameMode mode);
+  virtual bool begin_frame(FrameMode mode, Thread *current_thread);
+  virtual void end_frame(FrameMode mode, Thread *current_thread);
   virtual void end_flip();
 
   virtual int verify_window_sizes(int numsizes, int *dimen);

panda/src/mesadisplay/osMesaGraphicsBuffer.cxx

@@ -59,7 +59,7 @@ OsMesaGraphicsBuffer::
 //               should be skipped.
 ////////////////////////////////////////////////////////////////////
 bool OsMesaGraphicsBuffer::
-begin_frame(FrameMode mode) {
+begin_frame(FrameMode mode, Thread *current_thread) {
   begin_frame_spam();
   if (_gsg == (GraphicsStateGuardian *)NULL) {
     return false;
@@ -77,7 +77,7 @@ begin_frame(FrameMode mode) {
     clear_cube_map_selection();
   }
   _gsg->set_current_properties(&get_fb_properties());
-  return _gsg->begin_frame();
+  return _gsg->begin_frame(current_thread);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@ begin_frame(FrameMode mode) {
 //               should do whatever finalization is required.
 ////////////////////////////////////////////////////////////////////
 void OsMesaGraphicsBuffer::
-end_frame(FrameMode mode) {
+end_frame(FrameMode mode, Thread *current_thread) {
   end_frame_spam();
   nassertv(_gsg != (GraphicsStateGuardian *)NULL);
 
@@ -97,7 +97,7 @@ end_frame(FrameMode mode) {
     copy_to_textures();
   }
 
-  _gsg->end_frame();
+  _gsg->end_frame(current_thread);
 
   if (mode == FM_render) {
     trigger_flip();

panda/src/mesadisplay/osMesaGraphicsBuffer.h

@@ -40,8 +40,8 @@ public:
                        GraphicsOutput *host);
   virtual ~OsMesaGraphicsBuffer();
 
-  virtual bool begin_frame(FrameMode mode);
-  virtual void end_frame(FrameMode mode);
+  virtual bool begin_frame(FrameMode mode, Thread *current_thread);
+  virtual void end_frame(FrameMode mode, Thread *current_thread);
 
 protected:
   virtual void close_buffer();