From ce40d329d3639ab3e89328b938a8cdeb70906304 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 26 Apr 2006 14:34:03 +0000
Subject: [PATCH] add current_thread to begin_frame/end_frame (untested)

---
 panda/src/osxdisplay/osxGraphicsBuffer.cxx | 8 ++++----
 panda/src/osxdisplay/osxGraphicsBuffer.h   | 4 ++--
 panda/src/osxdisplay/osxGraphicsWindow.cxx | 8 ++++----
 panda/src/osxdisplay/osxGraphicsWindow.h   | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/panda/src/osxdisplay/osxGraphicsBuffer.cxx b/panda/src/osxdisplay/osxGraphicsBuffer.cxx
index 028ce67405..e372bb5210 100644
--- a/panda/src/osxdisplay/osxGraphicsBuffer.cxx
+++ b/panda/src/osxdisplay/osxGraphicsBuffer.cxx
@@ -63,7 +63,7 @@ osxGraphicsBuffer::
 //               should be skipped.
 ////////////////////////////////////////////////////////////////////
 bool osxGraphicsBuffer::
-begin_frame(FrameMode mode) {
+begin_frame(FrameMode mode, Thread *current_thread) {
   PStatTimer timer(_make_current_pcollector);
 
   begin_frame_spam();
@@ -83,7 +83,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);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ begin_frame(FrameMode mode) {
 //               should do whatever finalization is required.
 ////////////////////////////////////////////////////////////////////
 void osxGraphicsBuffer::
-end_frame(FrameMode mode) {
+end_frame(FrameMode mode, Thread *current_thread) {
   end_frame_spam();
   nassertv(_gsg != (GraphicsStateGuardian *)NULL);
 
@@ -104,7 +104,7 @@ end_frame(FrameMode mode) {
     copy_to_textures();
   }
 
-  _gsg->end_frame();
+  _gsg->end_frame(current_thread);
 
   if (mode == FM_render) {
     trigger_flip();
diff --git a/panda/src/osxdisplay/osxGraphicsBuffer.h b/panda/src/osxdisplay/osxGraphicsBuffer.h
index f561dd7fa5..6b286c7cbc 100644
--- a/panda/src/osxdisplay/osxGraphicsBuffer.h
+++ b/panda/src/osxdisplay/osxGraphicsBuffer.h
@@ -43,8 +43,8 @@ public:
   virtual ~osxGraphicsBuffer();
 
 
-  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();
diff --git a/panda/src/osxdisplay/osxGraphicsWindow.cxx b/panda/src/osxdisplay/osxGraphicsWindow.cxx
index fb1d6c116a..184616f8f2 100644
--- a/panda/src/osxdisplay/osxGraphicsWindow.cxx
+++ b/panda/src/osxdisplay/osxGraphicsWindow.cxx
@@ -557,7 +557,7 @@ OSStatus osxGraphicsWindow::buildGL (bool full_screen)
 //               if the frame should be rendered, or false if it
 //               should be skipped.
 ////////////////////////////////////////////////////////////////////
-bool osxGraphicsWindow::begin_frame(FrameMode mode)
+bool osxGraphicsWindow::begin_frame(FrameMode mode, Thread *current_thread)
  {
   PStatTimer timer(_make_current_pcollector);
  
@@ -604,7 +604,7 @@ bool osxGraphicsWindow::begin_frame(FrameMode mode)
 	
   _gsg->reset_if_new();
   _gsg->set_current_properties(&get_fb_properties());
-  return _gsg->begin_frame();
+  return _gsg->begin_frame(current_thread);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -614,7 +614,7 @@ bool osxGraphicsWindow::begin_frame(FrameMode mode)
 //               after rendering is completed for a given frame.  It
 //               should do whatever finalization is required.
 ////////////////////////////////////////////////////////////////////
-void osxGraphicsWindow::end_frame(FrameMode mode) 
+void osxGraphicsWindow::end_frame(FrameMode mode, Thread *current_thread) 
 {
   end_frame_spam();
   
@@ -623,7 +623,7 @@ void osxGraphicsWindow::end_frame(FrameMode mode)
   nassertv(_gsg != (GraphicsStateGuardian *)NULL);
 
 	aglSwapBuffers (get_ggs_context());
-  _gsg->end_frame();
+  _gsg->end_frame(current_thread);
   }
 //  trigger_flip();
 }
diff --git a/panda/src/osxdisplay/osxGraphicsWindow.h b/panda/src/osxdisplay/osxGraphicsWindow.h
index b6b0b7b48e..8f8a0ecd40 100644
--- a/panda/src/osxdisplay/osxGraphicsWindow.h
+++ b/panda/src/osxdisplay/osxGraphicsWindow.h
@@ -50,8 +50,8 @@ public:
   virtual bool move_pointer(int device, int x, int y);
 
 //  virtual void make_current();
-  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 begin_flip();
   virtual void end_flip();
   virtual void process_events();