From 8b407bb654cf7abbfb41b31d9ec9cb1a2472c175 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sat, 7 Mar 2009 22:06:24 +0000
Subject: [PATCH] build tinysdl with new engine rules

---
 panda/src/tinydisplay/tinySDLGraphicsPipe.cxx  |  3 ++-
 panda/src/tinydisplay/tinySDLGraphicsPipe.h    |  1 +
 .../src/tinydisplay/tinySDLGraphicsWindow.cxx  | 18 +++++++++---------
 panda/src/tinydisplay/tinySDLGraphicsWindow.h  |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx b/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx
index a867759395..48605e137f 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx
+++ b/panda/src/tinydisplay/tinySDLGraphicsPipe.cxx
@@ -91,6 +91,7 @@ make_output(const string &name,
             const FrameBufferProperties &fb_prop,
             const WindowProperties &win_prop,
             int flags,
+            GraphicsEngine *engine,
             GraphicsStateGuardian *gsg,
             GraphicsOutput *host,
             int retry,
@@ -116,7 +117,7 @@ make_output(const string &name,
         ((flags&BF_can_bind_every)!=0)) {
       return NULL;
     }
-    return new TinySDLGraphicsWindow(this, name, fb_prop, win_prop,
+    return new TinySDLGraphicsWindow(engine, this, name, fb_prop, win_prop,
                                      flags, gsg, host);
   }
   
diff --git a/panda/src/tinydisplay/tinySDLGraphicsPipe.h b/panda/src/tinydisplay/tinySDLGraphicsPipe.h
index 680a7749cc..24fa03bf04 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsPipe.h
+++ b/panda/src/tinydisplay/tinySDLGraphicsPipe.h
@@ -42,6 +42,7 @@ protected:
                                          const FrameBufferProperties &fb_prop,
                                          const WindowProperties &win_prop,
                                          int flags,
+                                         GraphicsEngine *engine,
                                          GraphicsStateGuardian *gsg,
                                          GraphicsOutput *host,
                                          int retry,
diff --git a/panda/src/tinydisplay/tinySDLGraphicsWindow.cxx b/panda/src/tinydisplay/tinySDLGraphicsWindow.cxx
index 245bf43009..48849320fb 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsWindow.cxx
+++ b/panda/src/tinydisplay/tinySDLGraphicsWindow.cxx
@@ -32,14 +32,14 @@ TypeHandle TinySDLGraphicsWindow::_type_handle;
 //  Description:
 ////////////////////////////////////////////////////////////////////
 TinySDLGraphicsWindow::
-TinySDLGraphicsWindow(GraphicsPipe *pipe, 
-                   const string &name,
-                   const FrameBufferProperties &fb_prop,
-                   const WindowProperties &win_prop,
-                   int flags,
-                   GraphicsStateGuardian *gsg,
-                   GraphicsOutput *host) :
-  GraphicsWindow(pipe, name, fb_prop, win_prop, flags, gsg, host)
+TinySDLGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, 
+                      const string &name,
+                      const FrameBufferProperties &fb_prop,
+                      const WindowProperties &win_prop,
+                      int flags,
+                      GraphicsStateGuardian *gsg,
+                      GraphicsOutput *host) :
+  GraphicsWindow(engine, pipe, name, fb_prop, win_prop, flags, gsg, host)
 {
   _screen = NULL;
   _frame_buffer = NULL;
@@ -304,7 +304,7 @@ open_window() {
   TinyGraphicsStateGuardian *tinygsg;
   if (_gsg == 0) {
     // There is no old gsg.  Create a new one.
-    tinygsg = new TinyGraphicsStateGuardian(_pipe, NULL);
+    tinygsg = new TinyGraphicsStateGuardian(_engine, _pipe, NULL);
     _gsg = tinygsg;
 
   } else {
diff --git a/panda/src/tinydisplay/tinySDLGraphicsWindow.h b/panda/src/tinydisplay/tinySDLGraphicsWindow.h
index c6a1f90eca..e51914bc23 100644
--- a/panda/src/tinydisplay/tinySDLGraphicsWindow.h
+++ b/panda/src/tinydisplay/tinySDLGraphicsWindow.h
@@ -31,7 +31,7 @@
 ////////////////////////////////////////////////////////////////////
 class EXPCL_TINYDISPLAY TinySDLGraphicsWindow : public GraphicsWindow {
 public:
-  TinySDLGraphicsWindow(GraphicsPipe *pipe, 
+  TinySDLGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, 
                         const string &name,
                         const FrameBufferProperties &fb_prop,
                         const WindowProperties &win_prop,