From e8a65e4cffb46484ea17bbabe30b9992c32e7fd4 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 21 Jun 2007 11:20:54 +0000 Subject: [PATCH] From Trajce Nikolov, windows build fixes --- include/osgViewer/api/Win32/PixelBufferWin32 | 3 +++ src/osgViewer/PixelBufferWin32.cpp | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/osgViewer/api/Win32/PixelBufferWin32 b/include/osgViewer/api/Win32/PixelBufferWin32 index d0771b50d..7a48dd9e5 100644 --- a/include/osgViewer/api/Win32/PixelBufferWin32 +++ b/include/osgViewer/api/Win32/PixelBufferWin32 @@ -54,6 +54,7 @@ class OSGVIEWER_EXPORT PixelBufferWin32 : public osgViewer::GraphicsWindow /** Make this graphics context current.*/ virtual bool makeCurrentImplementation(); + virtual bool makeContextCurrentImplementation( GraphicsContext* /*readContext*/ ); /** Release the graphics context.*/ virtual bool releaseContextImplementation(); @@ -69,6 +70,8 @@ class OSGVIEWER_EXPORT PixelBufferWin32 : public osgViewer::GraphicsWindow /** Get native OpenGL graphics context.*/ HGLRC getWGLContext() const { return _hglrc; } + virtual void bindPBufferToTextureImplementation( GLenum /*buffer*/ ); + protected: void init(); diff --git a/src/osgViewer/PixelBufferWin32.cpp b/src/osgViewer/PixelBufferWin32.cpp index b9d6aa096..a3a5387ed 100644 --- a/src/osgViewer/PixelBufferWin32.cpp +++ b/src/osgViewer/PixelBufferWin32.cpp @@ -57,11 +57,6 @@ PixelBufferWin32::~PixelBufferWin32() { } -bool PixelBufferWin32::valid() const -{ - return _valid; -} - void PixelBufferWin32::init() { if (_initialized) return; @@ -76,11 +71,6 @@ bool PixelBufferWin32::realizeImplementation() osg::notify(osg::NOTICE) << "PixelBufferWin32::realizeImplementation() not implemented." << std::endl; return false; } -bool PixelBufferWin32::isRealizedImplementation() const -{ - osg::notify(osg::NOTICE) << "PixelBufferWin32::isRealizedImplementation() not implemented." << std::endl; return false; -} - void PixelBufferWin32::closeImplementation() { osg::notify(osg::NOTICE) << "PixelBufferWin32::closeImplementation() not implemented." << std::endl;