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

Remove unneeded DisplayPlugin stuff.

Browse source
This commit is contained in:
howard-stearns 2015-12-07 16:56:59 -08:00
parent 55cfd1c8b4
commit b007617c85
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -151,7 +151,6 @@ OpenGLDisplayPlugin::OpenGLDisplayPlugin() {
_container->releaseOverlayTexture(texture);
});
_synchronizedTimer.start();
connect(&_timer, &QTimer::timeout, this, [&] {
#ifdef Q_OS_MAC
// On Mac, QT thread timing is such that we can miss one or even two cycles quite often, giving a render rate (including update/simulate)
@ -161,7 +160,6 @@ OpenGLDisplayPlugin::OpenGLDisplayPlugin() {
#else
if (_active && _sceneTextureEscrow.depth() < 1) {
#endif
_synchronizedTimer.start();
emit requestRender();
}
});
@ -283,10 +281,6 @@ void OpenGLDisplayPlugin::submitOverlayTexture(GLuint sceneTexture, const glm::u
}
void OpenGLDisplayPlugin::updateTextures() {
const qint64 elapsed =_synchronizedTimer.elapsed();
if (elapsed != 0) {
_lastSynchronizedElapsed = elapsed;
}
_currentSceneTexture = _sceneTextureEscrow.fetchAndRelease(_currentSceneTexture);
_currentOverlayTexture = _overlayTextureEscrow.fetchAndRelease(_currentOverlayTexture);
}

4
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
View file

@ -10,7 +10,6 @@
#include "DisplayPlugin.h"
#include <QtCore/QTimer>
#include <QElapsedTimer>
#include <GLMHelpers.h>
#include <SimpleMovingAverage.h>
@ -31,7 +30,6 @@ public:
virtual void submitSceneTexture(uint32_t frameIndex, uint32_t sceneTexture, const glm::uvec2& sceneSize) override;
virtual void submitOverlayTexture(uint32_t overlayTexture, const glm::uvec2& overlaySize) override;
virtual float presentRate() override;
virtual qint64 getLastSynchronizedElapsed() { return _lastSynchronizedElapsed; }
virtual glm::uvec2 getRecommendedRenderSize() const override {
return getSurfacePixels();
@ -70,8 +68,6 @@ protected:
virtual void internalPresent();
mutable QTimer _timer;
QElapsedTimer _synchronizedTimer;
qint64 _lastSynchronizedElapsed { 0 };
ProgramPtr _program;
ShapeWrapperPtr _plane;