Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 20:12:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing PR build

Browse source
This commit is contained in:
Brad Davis 2018-04-23 20:41:36 -07:00
parent 861200db27
commit ecaf162afb
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/qml/src/qml/OffscreenSurface.cpp
View file

@ -67,7 +67,6 @@ OffscreenSurface::OffscreenSurface()
OffscreenSurface::~OffscreenSurface() { OffscreenSurface::~OffscreenSurface() {
delete _sharedObject; delete _sharedObject;
const_cast<SharedObject*>(_sharedObject) = nullptr;
} }
bool OffscreenSurface::fetchTexture(TextureAndFence& textureAndFence) { bool OffscreenSurface::fetchTexture(TextureAndFence& textureAndFence) {

6
tests/render-perf/src/main.cpp
View file

@ -453,8 +453,8 @@ protected:
return vec3(); return vec3();
} }
bool isAboutToQuit() const override { return false; } void postLambdaEvent(const std::function<void()>& f) override {}
void postLambdaEvent(std::function<void()> f) override {} void sendLambdaEvent(const std::function<void()>& f) override {}
qreal getDevicePixelRatio() override { qreal getDevicePixelRatio() override {
return 1.0f; return 1.0f;
@ -469,7 +469,7 @@ protected:
} }
std::map<void*, std::function<void()>> _postUpdateLambdas; std::map<void*, std::function<void()>> _postUpdateLambdas;
void pushPostUpdateLambda(void* key, std::function<void()> func) override { void pushPostUpdateLambda(void* key, const std::function<void()>& func) override {
_postUpdateLambdas[key] = func; _postUpdateLambdas[key] = func;
} }