|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-droid.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.6.4.tar.bz2/customcontext/animation/animationdriver.cpp
^
|
| @@ -78,10 +78,14 @@
qint64 AnimationDriver::elapsed() const
{
- if (!isRunning() || m_vsyncDelta < 0 || m_timeMode == CurrentTime)
- return startTime() + m_animationTimer.elapsed();
+ if (!isRunning()) {
+ // This is strictly a bug, but be graceful about it...
+ return 0;
+ }
+ if (m_vsyncDelta < 0 || m_timeMode == CurrentTime)
+ return m_animationTimer.elapsed();
else
- return startTime() + m_animationTime;
+ return m_animationTime;
}
void AnimationDriver::start()
@@ -99,7 +103,7 @@
if (m_vsyncDelta < 0) {
m_animationTime = currentTime;
- QAnimationDriver::advanceAnimation(startTime() + m_animationTime);
+ QAnimationDriver::advanceAnimation(m_animationTime);
return;
}
@@ -148,11 +152,11 @@
m_animationTime = currentTime;
}
-// printf(" - (%s) advancing by: startTime=%d, animTime=%d, current=%d %s\n",
+// printf(" - (%s) advancing by: animTime=%d, current=%d %s\n",
// m_timeMode == PredictedTime ? "pre" : "cur",
-// (int) startTime(), (int) m_animationTime, (int) currentTime, badFrame ? "*bad*" : "");
+// (int) m_animationTime, (int) currentTime, badFrame ? "*bad*" : "");
- QAnimationDriver::advanceAnimation(startTime() + m_animationTime);
+ QAnimationDriver::advanceAnimation(m_animationTime);
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.6.4.tar.bz2/customcontext/animation/swaplisteninganimationdriver.cpp
^
|
| @@ -97,9 +97,9 @@
qint64 SwapListeningAnimationDriver::elapsed() const
{
if (!isRunning() || m_stableVsync <= 0)
- return startTime() + m_timer.elapsed();
+ return m_timer.elapsed();
else
- return startTime() + m_currentTime;
+ return m_currentTime;
}
void SwapListeningAnimationDriver::advance()
@@ -116,5 +116,5 @@
m_currentTime = m_timer.elapsed();
}
- QAnimationDriver::advanceAnimation(startTime() + m_currentTime);
+ QAnimationDriver::advanceAnimation(m_currentTime);
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.6.4.tar.bz2/customcontext/context.cpp
^
|
| @@ -159,7 +159,7 @@
: QSGContext(parent)
, m_sampleCount(0)
, m_useMultisampling(false)
-#ifdef CUSTOMCONTEXT_USE_HYBRISTEXTURE
+#ifdef CUSTOMCONTEXT_HYBRISTEXTURE
, m_hybrisTexture(false)
#endif
{
@@ -426,6 +426,7 @@
format.setDepthBufferSize(24);
if (m_useMultisampling)
format.setSamples(m_sampleCount);
+ format.setAlphaBufferSize(8);
return format;
}
#endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.6.4.tar.bz2/customcontext/context.h
^
|
| @@ -80,7 +80,7 @@
QSGRenderer *createRenderer();
#ifdef PROGRAM_BINARY
- void compile(QSGMaterialShader *shader, QSGMaterial *material, const char *vertex, const char *fragment);
+ void compile(QSGMaterialShader *shader, QSGMaterial *material, const char *vertex = 0, const char *fragment = 0);
#endif
#ifdef CUSTOMCONTEXT_DITHER
|
|
[-]
[+]
|
Changed |
_service:tar_git:qtscenegraph-adaptation-0.6.4.tar.bz2/customcontext/texture/hybristexture.cpp
^
|
| @@ -39,14 +39,16 @@
**
****************************************************************************/
+#include <QtCore/qdebug.h>
+#include <QtCore/QCoreApplication>
+
+#include <QtGui/private/qdrawhelper_p.h>
+
#include "hybristexture.h"
#include <QtCore/QElapsedTimer>
#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
-#include <QtCore/qdebug.h>
-#include <QtGui/private/qdrawhelper_p.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
|
