2
0
Эх сурвалжийг харах

A few fixes related to the recent begin-frame refactor

Josh Yelon 20 жил өмнө
parent
commit
0b02e92c0d

+ 2 - 2
panda/src/wgldisplay/wglGraphicsBuffer.cxx

@@ -128,7 +128,7 @@ end_frame(FrameMode mode) {
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: wglGraphicsStateGuardian::begin_render_texture
 //     Function: wglGraphicsStateGuardian::begin_render_texture
-//       Access: Public, Virtual
+//       Access: Private
 //  Description: If the GraphicsOutput supports direct render-to-texture,
 //  Description: If the GraphicsOutput supports direct render-to-texture,
 //               and if any setup needs to be done during begin_frame,
 //               and if any setup needs to be done during begin_frame,
 //               then the setup code should go here.  Any textures that
 //               then the setup code should go here.  Any textures that
@@ -149,7 +149,7 @@ begin_render_texture() {
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsOutput::end_render_texture
 //     Function: GraphicsOutput::end_render_texture
-//       Access: Public, Virtual
+//       Access: Private
 //  Description: If the GraphicsOutput supports direct render-to-texture,
 //  Description: If the GraphicsOutput supports direct render-to-texture,
 //               and if any setup needs to be done during end_frame,
 //               and if any setup needs to be done during end_frame,
 //               then the setup code should go here.  Any textures that
 //               then the setup code should go here.  Any textures that

+ 2 - 3
panda/src/wgldisplay/wglGraphicsBuffer.h

@@ -52,9 +52,6 @@ public:
   virtual void select_cube_map(int cube_map_index);
   virtual void select_cube_map(int cube_map_index);
   virtual void release_gsg();
   virtual void release_gsg();
 
 
-  virtual void begin_render_texture();
-  virtual void end_render_texture();
-  
   virtual void process_events();
   virtual void process_events();
 
 
 protected:
 protected:
@@ -62,6 +59,8 @@ protected:
   virtual bool open_buffer();
   virtual bool open_buffer();
 
 
 private:
 private:
+  void begin_render_texture();
+  void end_render_texture();
   bool make_pbuffer(HDC window_dc);
   bool make_pbuffer(HDC window_dc);
   int choose_pbuffer_format(HDC twindow_dc, bool draw_to_texture);
   int choose_pbuffer_format(HDC twindow_dc, bool draw_to_texture);