From 528a607f4ae229288727fafc943b7814f37fc7d9 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 20 Mar 2014 22:56:53 +0000 Subject: [PATCH] Add FrameBufferProperties argument to WindowFramework --- panda/src/framework/windowFramework.cxx | 8 ++++---- panda/src/framework/windowFramework.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/panda/src/framework/windowFramework.cxx b/panda/src/framework/windowFramework.cxx index 1d48b829d4..3cc0cc1f76 100644 --- a/panda/src/framework/windowFramework.cxx +++ b/panda/src/framework/windowFramework.cxx @@ -145,7 +145,8 @@ WindowFramework:: //////////////////////////////////////////////////////////////////// GraphicsOutput *WindowFramework:: open_window(const WindowProperties &props, int flags, GraphicsEngine *engine, - GraphicsPipe *pipe, GraphicsStateGuardian *gsg) { + GraphicsPipe *pipe, GraphicsStateGuardian *gsg, + const FrameBufferProperties &fbprops) { nassertr(_window == (GraphicsOutput *)NULL, _window); static int next_window_index = 1; @@ -155,9 +156,8 @@ open_window(const WindowProperties &props, int flags, GraphicsEngine *engine, string name = stream.str(); _window = 0; - GraphicsOutput *winout = - engine->make_output(pipe, name, 0, - FrameBufferProperties::get_default(), + GraphicsOutput *winout = + engine->make_output(pipe, name, 0, fbprops, props, flags, gsg, NULL); if (winout != (GraphicsOutput *)NULL) { _window = winout; diff --git a/panda/src/framework/windowFramework.h b/panda/src/framework/windowFramework.h index c224d6e2c6..71520167e9 100644 --- a/panda/src/framework/windowFramework.h +++ b/panda/src/framework/windowFramework.h @@ -63,7 +63,9 @@ public: protected: GraphicsOutput *open_window(const WindowProperties &props, int flags, GraphicsEngine *engine, GraphicsPipe *pipe, - GraphicsStateGuardian *gsg = NULL); + GraphicsStateGuardian *gsg = NULL, + const FrameBufferProperties &fbprops = + FrameBufferProperties::get_default()); void close_window(); public: