# HG changeset patch # User Sebastien Jodogne # Date 1570711027 -7200 # Node ID 7fad86d621350682871c78d8142657592fdb2abd # Parent d393ad9cf68c180f1ae860fef7a1afc7705acfd6 removed unused abstraction IOpenGLContextLossMonitor diff -r d393ad9cf68c -r 7fad86d62135 Framework/OpenGL/IOpenGLContextLossMonitor.h --- a/Framework/OpenGL/IOpenGLContextLossMonitor.h Thu Oct 10 14:31:56 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/** - * Stone of Orthanc - * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics - * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., Belgium - * - * This program is free software: you can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License - * as published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - **/ - -#pragma once - -namespace OrthancStone -{ - namespace OpenGL - { - class IOpenGLContextLossMonitor : public boost::noncopyable - { - public: - virtual ~IOpenGLContextLossMonitor() - { - } - - virtual void* DebugGetInternalContext() const = 0; - - // This is for manual context loss (debug purposes) - virtual void SetLostContext() = 0; - virtual void RestoreLostContext() = 0; - }; - } -} diff -r d393ad9cf68c -r 7fad86d62135 Framework/OpenGL/WebAssemblyOpenGLContext.h --- a/Framework/OpenGL/WebAssemblyOpenGLContext.h Thu Oct 10 14:31:56 2019 +0200 +++ b/Framework/OpenGL/WebAssemblyOpenGLContext.h Thu Oct 10 14:37:07 2019 +0200 @@ -38,7 +38,6 @@ #endif #include "IOpenGLContext.h" -#include "IOpenGLContextLossMonitor.h" #include @@ -48,9 +47,7 @@ { namespace OpenGL { - class WebAssemblyOpenGLContext : - public OpenGL::IOpenGLContext, - public OpenGL::IOpenGLContextLossMonitor + class WebAssemblyOpenGLContext : public OpenGL::IOpenGLContext { private: class PImpl; @@ -61,9 +58,6 @@ virtual bool IsContextLost() ORTHANC_OVERRIDE; - virtual void SetLostContext() ORTHANC_OVERRIDE; - virtual void RestoreLostContext() ORTHANC_OVERRIDE; - virtual void MakeCurrent() ORTHANC_OVERRIDE; virtual void SwapBuffer() ORTHANC_OVERRIDE; @@ -72,8 +66,6 @@ virtual unsigned int GetCanvasHeight() const ORTHANC_OVERRIDE; - virtual void* DebugGetInternalContext() const ORTHANC_OVERRIDE; - /** Returns true if the underlying context has been successfully recreated */ @@ -82,6 +74,13 @@ void UpdateSize(); const std::string& GetCanvasIdentifier() const; + + + /** + * This is for manual context loss (debug purposes) + **/ + void* DebugGetInternalContext() const; + void SetLostContext(); }; } }