remove old code

panda/src/display/Sources.pp

@@ -31,8 +31,7 @@
     graphicsDevice.h graphicsDevice.I \
     parasiteBuffer.I parasiteBuffer.h \
     windowProperties.I windowProperties.h \
-    lensStack.I lensStack.h \
+    lensStack.I lensStack.h
-    savedFrameBuffer.I savedFrameBuffer.h
     
  #define INCLUDED_SOURCES  \
     config_display.cxx \
@@ -49,8 +48,7 @@
     graphicsWindow.cxx graphicsWindowInputDevice.cxx  \
     graphicsDevice.cxx \
     parasiteBuffer.cxx \
-    windowProperties.cxx \
+    windowProperties.cxx
-    savedFrameBuffer.cxx
 
   #define INSTALL_HEADERS \
     config_display.h \
@@ -72,8 +70,7 @@
     parasiteBuffer.I parasiteBuffer.h \
     windowProperties.I windowProperties.h \
     lensStack.I lensStack.h \
-    renderBuffer.h \
+    renderBuffer.h
-    savedFrameBuffer.I savedFrameBuffer.h
 
   #define IGATESCAN all
 

panda/src/display/config_display.cxx

@@ -19,13 +19,11 @@
 
 #include "config_display.h"
 #include "graphicsStateGuardian.h"
-#include "savedFrameBuffer.h"
 #include "graphicsPipe.h"
 #include "graphicsOutput.h"
 #include "graphicsBuffer.h"
 #include "graphicsWindow.h"
 #include "parasiteBuffer.h"
-#include "textureContext.h"
 
 ConfigureDef(config_display);
 NotifyCategoryDef(display, "");
@@ -250,11 +248,9 @@ init_libdisplay() {
   initialized = true;
 
   GraphicsStateGuardian::init_type();
-  SavedFrameBuffer::init_type();
   GraphicsPipe::init_type();
   GraphicsOutput::init_type();
   GraphicsWindow::init_type();
   GraphicsBuffer::init_type();
   ParasiteBuffer::init_type();
-  TextureContext::init_type();
 }

panda/src/display/display_composite2.cxx

@@ -3,7 +3,6 @@
 #include "graphicsPipeSelection.cxx"
 #include "graphicsThreadingModel.cxx"
 #include "graphicsDevice.cxx"
-#include "savedFrameBuffer.cxx"
 #include "windowProperties.cxx"
 #include "graphicsWindow.cxx"
 #include "graphicsBuffer.cxx"

panda/src/display/graphicsStateGuardian.h

@@ -21,7 +21,6 @@
 
 #include "pandabase.h"
 
-#include "savedFrameBuffer.h"
 #include "frameBufferProperties.h"
 #include "displayRegionStack.h"
 #include "lensStack.h"

panda/src/display/savedFrameBuffer.I

@@ -1,28 +0,0 @@
-// Filename: savedFrameBuffer.I
-// Created by:  drose (06Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////
-//     Function: SavedFrameBuffer::Constructor
-//       Access: Public
-//  Description:
-////////////////////////////////////////////////////////////////////
-INLINE SavedFrameBuffer::
-SavedFrameBuffer(const RenderBuffer &buffer, CPT(DisplayRegion) dr) :
-  _buffer(buffer), _display_region(dr)
-{
-}

panda/src/display/savedFrameBuffer.cxx

@@ -1,22 +0,0 @@
-// Filename: savedFrameBuffer.cxx
-// Created by:  drose (06Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-
-#include "savedFrameBuffer.h"
-
-TypeHandle SavedFrameBuffer::_type_handle;

panda/src/display/savedFrameBuffer.h

@@ -1,80 +0,0 @@
-// Filename: savedFrameBuffer.h
-// Created by:  drose (06Oct99)
-//
-////////////////////////////////////////////////////////////////////
-//
-// PANDA 3D SOFTWARE
-// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
-//
-// All use of this software is subject to the terms of the Panda 3d
-// Software license.  You should have received a copy of this license
-// along with this source code; you will also find a current copy of
-// the license at http://etc.cmu.edu/panda3d/docs/license/ .
-//
-// To contact the maintainers of this program write to
-// panda3d-general@lists.sourceforge.net .
-//
-////////////////////////////////////////////////////////////////////
-
-#ifndef SAVEDFRAMEBUFFER_H
-#define SAVEDFRAMEBUFFER_H
-
-#include "pandabase.h"
-
-#include "renderBuffer.h"
-#include "displayRegion.h"
-
-#include "typedReferenceCount.h"
-#include "pointerTo.h"
-
-////////////////////////////////////////////////////////////////////
-//       Class : SavedFrameBuffer
-// Description : Occasionally we need to save the contents of the
-//               frame buffer for restoring later, particularly when
-//               we are doing multipass effects.  The precise form in
-//               which the frame buffer is optimally saved may vary
-//               from one platform to another; hence, we have the
-//               SavedFrameBuffer class, which is a placeholder
-//               structure to store the frame buffer in whichever way
-//               a particular GSG would prefer to do it.
-//
-//               Each specific GSG will also derive a new kind of
-//               SavedFrameBuffer object that it will use to store its
-//               frame buffer contents meaningfully.
-//
-//               This class is not meant to be used directly; it is
-//               used within the FrameBufferStack class to support
-//               GraphicsStateGuardian::push_frame_buffer() and
-//               pop_frame_buffer().
-////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA SavedFrameBuffer : public TypedReferenceCount {
-public:
-  INLINE SavedFrameBuffer(const RenderBuffer &buffer,
-                          CPT(DisplayRegion) dr);
-
-  RenderBuffer _buffer;
-  CPT(DisplayRegion) _display_region;
-
-
-public:
-  static TypeHandle get_class_type() {
-    return _type_handle;
-  }
-  static void init_type() {
-    TypedReferenceCount::init_type();
-    register_type(_type_handle, "SavedFrameBuffer",
-                  TypedReferenceCount::get_class_type());
-  }
-  virtual TypeHandle get_type() const {
-    return get_class_type();
-  }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
-
-private:
-  static TypeHandle _type_handle;
-};
-
-#include "savedFrameBuffer.I"
-
-#endif
-