diff --git a/panda/src/osxdisplay/osxGraphicsBuffer.cxx b/panda/src/osxdisplay/osxGraphicsBuffer.cxx index b613597dab..92dc770e81 100644 --- a/panda/src/osxdisplay/osxGraphicsBuffer.cxx +++ b/panda/src/osxdisplay/osxGraphicsBuffer.cxx @@ -26,14 +26,14 @@ TypeHandle osxGraphicsBuffer::_type_handle; // Description: //////////////////////////////////////////////////////////////////// osxGraphicsBuffer:: -osxGraphicsBuffer(GraphicsPipe *pipe, +osxGraphicsBuffer(GraphicsEngine *engine, GraphicsPipe *pipe, const string &name, const FrameBufferProperties &fb_prop, const WindowProperties &win_prop, int flags, GraphicsStateGuardian *gsg, GraphicsOutput *host) : - GraphicsBuffer(pipe, name, fb_prop, win_prop, flags, gsg, host) + GraphicsBuffer(engine, pipe, name, fb_prop, win_prop, flags, gsg, host) { osxGraphicsPipe *osx_pipe; DCAST_INTO_V(osx_pipe, _pipe); @@ -142,7 +142,7 @@ bool osxGraphicsBuffer:: open_buffer() { if (_gsg == 0) { - _gsg = new osxGraphicsStateGuardian(_pipe, NULL); + _gsg = new osxGraphicsStateGuardian(_engine, _pipe, NULL); } return false; diff --git a/panda/src/osxdisplay/osxGraphicsBuffer.h b/panda/src/osxdisplay/osxGraphicsBuffer.h index ca1cb9b783..c1808ef9c7 100644 --- a/panda/src/osxdisplay/osxGraphicsBuffer.h +++ b/panda/src/osxdisplay/osxGraphicsBuffer.h @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////// class EXPCL_PANDAGL osxGraphicsBuffer : public GraphicsBuffer { public: - osxGraphicsBuffer(GraphicsPipe *pipe, + osxGraphicsBuffer(GraphicsEngine *engine, GraphicsPipe *pipe, const string &name, const FrameBufferProperties &fb_prop, const WindowProperties &win_prop, diff --git a/panda/src/osxdisplay/osxGraphicsPipe.cxx b/panda/src/osxdisplay/osxGraphicsPipe.cxx index 064d79e3b9..db56a151d7 100644 --- a/panda/src/osxdisplay/osxGraphicsPipe.cxx +++ b/panda/src/osxdisplay/osxGraphicsPipe.cxx @@ -207,6 +207,7 @@ make_output(const string &name, const FrameBufferProperties &fb_prop, const WindowProperties &win_prop, int flags, + GraphicsEngine *engine, GraphicsStateGuardian *gsg, GraphicsOutput *host, int retry, @@ -232,7 +233,7 @@ make_output(const string &name, ((flags&BF_can_bind_every)!=0)) { return NULL; } - return new osxGraphicsWindow(this, name, fb_prop, win_prop, + return new osxGraphicsWindow(engine, this, name, fb_prop, win_prop, flags, gsg, host); } diff --git a/panda/src/osxdisplay/osxGraphicsPipe.h b/panda/src/osxdisplay/osxGraphicsPipe.h index 4d92545bf2..80f6ad9a71 100644 --- a/panda/src/osxdisplay/osxGraphicsPipe.h +++ b/panda/src/osxdisplay/osxGraphicsPipe.h @@ -45,6 +45,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/osxdisplay/osxGraphicsStateGuardian.cxx b/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx index c3e957855a..9a7dcaf09d 100644 --- a/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx +++ b/panda/src/osxdisplay/osxGraphicsStateGuardian.cxx @@ -61,9 +61,9 @@ void *osxGraphicsStateGuardian::get_extension_func(const char *prefix, const cha // Description: //////////////////////////////////////////////////////////////////// osxGraphicsStateGuardian:: -osxGraphicsStateGuardian(GraphicsPipe *pipe, +osxGraphicsStateGuardian(GraphicsEngine *engine, GraphicsPipe *pipe, osxGraphicsStateGuardian *share_with) : - GLGraphicsStateGuardian(pipe), + GLGraphicsStateGuardian(engine, pipe), _share_with(share_with), _aglPixFmt(NULL), _aglcontext(NULL) diff --git a/panda/src/osxdisplay/osxGraphicsStateGuardian.h b/panda/src/osxdisplay/osxGraphicsStateGuardian.h index e6213b01b7..ff24378522 100644 --- a/panda/src/osxdisplay/osxGraphicsStateGuardian.h +++ b/panda/src/osxdisplay/osxGraphicsStateGuardian.h @@ -33,7 +33,7 @@ class osxGraphicsWindow; //////////////////////////////////////////////////////////////////// class osxGraphicsStateGuardian : public GLGraphicsStateGuardian { public: - osxGraphicsStateGuardian(GraphicsPipe *pipe, + osxGraphicsStateGuardian(GraphicsEngine *engine, GraphicsPipe *pipe, osxGraphicsStateGuardian *share_with); virtual ~osxGraphicsStateGuardian(); virtual void reset(); diff --git a/panda/src/osxdisplay/osxGraphicsWindow.h b/panda/src/osxdisplay/osxGraphicsWindow.h index 6cee256e8a..089e53ba8c 100644 --- a/panda/src/osxdisplay/osxGraphicsWindow.h +++ b/panda/src/osxdisplay/osxGraphicsWindow.h @@ -33,7 +33,7 @@ OSStatus aglReportError (const std::string &); //////////////////////////////////////////////////////////////////// class osxGraphicsWindow : public GraphicsWindow { public: - osxGraphicsWindow(GraphicsPipe *pipe, + osxGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, const string &name, const FrameBufferProperties &fb_prop, const WindowProperties &win_prop, diff --git a/panda/src/osxdisplay/osxGraphicsWindow.mm b/panda/src/osxdisplay/osxGraphicsWindow.mm index f72ee8cf14..a8d7c42e7f 100644 --- a/panda/src/osxdisplay/osxGraphicsWindow.mm +++ b/panda/src/osxdisplay/osxGraphicsWindow.mm @@ -600,14 +600,14 @@ static int id_seed = 100; // Access: Public // Description: //////////////////////////////////////////////////////////////////// -osxGraphicsWindow::osxGraphicsWindow(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), +osxGraphicsWindow::osxGraphicsWindow(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), _osx_window(NULL), _is_fullscreen(false), _pending_icon(NULL), @@ -1020,7 +1020,7 @@ bool osxGraphicsWindow::open_window() if (_gsg == 0) { - _gsg = new osxGraphicsStateGuardian(_pipe, NULL); + _gsg = new osxGraphicsStateGuardian(_engine, _pipe, NULL); } //OSXGloablMutex().lock(); diff --git a/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx b/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx index 1d514ff1fe..76661589c9 100644 --- a/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx +++ b/panda/src/tinydisplay/tinyOsxGraphicsPipe.cxx @@ -200,6 +200,7 @@ make_output(const string &name, const FrameBufferProperties &fb_prop, const WindowProperties &win_prop, int flags, + GraphicsEngine *engine, GraphicsStateGuardian *gsg, GraphicsOutput *host, int retry, @@ -233,7 +234,7 @@ make_output(const string &name, return NULL; } } - return new TinyOsxGraphicsWindow(this, name, fb_prop, win_prop, + return new TinyOsxGraphicsWindow(engine, this, name, fb_prop, win_prop, flags, gsg, host); } @@ -243,7 +244,7 @@ make_output(const string &name, ((flags&BF_require_window)!=0)) { return NULL; } - return new TinyGraphicsBuffer(this, name, fb_prop, win_prop, flags, gsg, host); + return new TinyGraphicsBuffer(engine, this, name, fb_prop, win_prop, flags, gsg, host); } // Nothing else left to try. diff --git a/panda/src/tinydisplay/tinyOsxGraphicsPipe.h b/panda/src/tinydisplay/tinyOsxGraphicsPipe.h index ce7d270f05..3476d8bcb5 100644 --- a/panda/src/tinydisplay/tinyOsxGraphicsPipe.h +++ b/panda/src/tinydisplay/tinyOsxGraphicsPipe.h @@ -50,6 +50,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/tinyOsxGraphicsWindow.h b/panda/src/tinydisplay/tinyOsxGraphicsWindow.h index 4d5b3d9c6b..ee1849eccf 100644 --- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.h +++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.h @@ -32,7 +32,7 @@ //////////////////////////////////////////////////////////////////// class TinyOsxGraphicsWindow : public GraphicsWindow { public: - TinyOsxGraphicsWindow(GraphicsPipe *pipe, + TinyOsxGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe, const string &name, const FrameBufferProperties &fb_prop, const WindowProperties &win_prop, diff --git a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm index a53c16a4d1..9393edd095 100644 --- a/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm +++ b/panda/src/tinydisplay/tinyOsxGraphicsWindow.mm @@ -480,14 +480,14 @@ static int id_seed = 100; // Access: Public // Description: //////////////////////////////////////////////////////////////////// -TinyOsxGraphicsWindow::TinyOsxGraphicsWindow(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), +TinyOsxGraphicsWindow::TinyOsxGraphicsWindow(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), _osx_window(NULL), _is_fullscreen(false), _pending_icon(NULL), @@ -801,7 +801,7 @@ bool TinyOsxGraphicsWindow::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 { DCAST_INTO_R(tinygsg, _gsg, false);