1479ad1c63
Re-work the makeSomeOpenGLContextCurrent logic into a shared function with the existing AcquireContext logic in the SalOpenGLGraphics impl. Use an OpenGLVCLContextZone placeholder to do both context and zone management - to include destructors into the zone. Fix a number of error cases around SalBitmaps where we did not have a GL context associated when allocating, and/or freeing textures.. Don't drag a (potentially) slower context around in the OpenGLSalBitmap when we're going to check / fetch a better VCL context anyway. Change-Id: Ibbb2358c47156cd078ad28b6aad4f03af36aaf23 Reviewed-on: https://gerrit.libreoffice.org/21127 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
53 lines
1.5 KiB
C++
53 lines
1.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#ifndef INCLUDED_VCL_INC_OPENGL_ZONE_H
|
|
#define INCLUDED_VCL_INC_OPENGL_ZONE_H
|
|
|
|
#include <sal/config.h>
|
|
#include <sal/types.h>
|
|
#include <vcl/dllapi.h>
|
|
|
|
class OpenGLZoneTest;
|
|
class OpenGLWatchdogThread;
|
|
|
|
/**
|
|
* We want to be able to detect if a given crash came
|
|
* from the OpenGL code, so use this helper to track that.
|
|
*/
|
|
class OpenGLZone {
|
|
friend class OpenGLZoneTest;
|
|
friend class OpenGLWatchdogThread;
|
|
friend class OpenGLSalGraphicsImpl;
|
|
|
|
/// how many times have we entered a GL zone
|
|
static volatile sal_uInt64 gnEnterCount;
|
|
/// how many times have we left a new GL zone
|
|
static volatile sal_uInt64 gnLeaveCount;
|
|
|
|
static VCL_DLLPUBLIC void enter();
|
|
static VCL_DLLPUBLIC void leave();
|
|
public:
|
|
OpenGLZone() { gnEnterCount++; }
|
|
~OpenGLZone() { gnLeaveCount++; }
|
|
static bool isInZone() { return gnEnterCount != gnLeaveCount; }
|
|
static void hardDisable();
|
|
};
|
|
|
|
/// Create this to not only enter the zone, but set VCL context.
|
|
class OpenGLVCLContextZone {
|
|
OpenGLZone aZone;
|
|
public:
|
|
OpenGLVCLContextZone();
|
|
};
|
|
|
|
#endif // INCLUDED_VCL_INC_OPENGL_ZONE_H
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|