Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 20:58:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix debug compile issues

Browse source
This commit is contained in:
Brad Davis 2016-10-20 13:56:01 -07:00
parent 9523660027
commit c27ee634ea
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/gl/src/gl/OffscreenQmlSurface.cpp
View file

@ -55,12 +55,12 @@ class OffscreenTextures {
public: public:
GLuint getNextTexture(const uvec2& size) { GLuint getNextTexture(const uvec2& size) {
assert(QThread::currentThread() == qApp->thread()); assert(QThread::currentThread() == qApp->thread());
assert(textures.count(size));
recycle(); recycle();
++_activeTextureCount; ++_activeTextureCount;
auto sizeKey = uvec2ToUint64(size); auto sizeKey = uvec2ToUint64(size);
assert(_textures.count(sizeKey));
auto& textureSet = _textures[sizeKey]; auto& textureSet = _textures[sizeKey];
if (!textureSet.returnedTextures.empty()) { if (!textureSet.returnedTextures.empty()) {
auto textureAndFence = textureSet.returnedTextures.front(); auto textureAndFence = textureSet.returnedTextures.front();
@ -73,10 +73,9 @@ public:
} }
void releaseSize(const uvec2& size) { void releaseSize(const uvec2& size) {
assert(QOpenGLContext::currentContext());
assert(QThread::currentThread() == qApp->thread()); assert(QThread::currentThread() == qApp->thread());
assert(textures.count(size));
auto sizeKey = uvec2ToUint64(size); auto sizeKey = uvec2ToUint64(size);
assert(_textures.count(sizeKey));
auto& textureSet = _textures[sizeKey]; auto& textureSet = _textures[sizeKey];
if (0 == --textureSet.count) { if (0 == --textureSet.count) {
for (const auto& textureAndFence : textureSet.returnedTextures) { for (const auto& textureAndFence : textureSet.returnedTextures) {
@ -88,7 +87,6 @@ public:
void acquireSize(const uvec2& size) { void acquireSize(const uvec2& size) {
assert(QThread::currentThread() == qApp->thread()); assert(QThread::currentThread() == qApp->thread());
assert(textures.count(size));
auto sizeKey = uvec2ToUint64(size); auto sizeKey = uvec2ToUint64(size);
auto& textureSet = _textures[sizeKey]; auto& textureSet = _textures[sizeKey];
++textureSet.count; ++textureSet.count;
@ -241,6 +239,7 @@ Q_LOGGING_CATEGORY(offscreenFocus, "hifi.offscreen.focus")
void OffscreenQmlSurface::cleanup() { void OffscreenQmlSurface::cleanup() {
_canvas->makeCurrent(); _canvas->makeCurrent();
_renderControl->invalidate();
delete _renderControl; // and invalidate delete _renderControl; // and invalidate
if (_depthStencil) { if (_depthStencil) {