summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVal Doroshchuk <valentyn.doroshchuk@qt.io>2019-02-12 09:22:23 +0100
committerLiang Qi <liang.qi@qt.io>2019-02-12 08:46:08 +0000
commitd662241bfeffc3bc36ad812393cfc8bf706f863d (patch)
treea0109b5bf47a63b669a6455b2321baee07a33806
parentd16b7cf6e478ae578ecae860c58a079fe9f05d54 (diff)
Fix QPainterVideoSurface test to respect libGLESv2
Task-number: QTBUG-73755 Change-Id: Icadaf43599f0369524416ab5f3a38f7612205cc6 Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index fd0917943..197e21f14 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -212,7 +212,7 @@ void tst_QPainterVideoSurface::supportedFormat_data()
<< QAbstractVideoBuffer::NoHandle
<< QVideoFrame::Format_RGB24
<< QSize(1024, 768)
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
<< true
<< true;
#else
@@ -223,7 +223,7 @@ void tst_QPainterVideoSurface::supportedFormat_data()
<< QAbstractVideoBuffer::NoHandle
<< QVideoFrame::Format_RGB24
<< QSize(-1024, -768)
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
<< true
#else
<< false
@@ -374,7 +374,7 @@ void tst_QPainterVideoSurface::present_data()
<< int(sizeof(argb32ImageData))
<< 8;
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
QTest::newRow("rgb32 -> rgb24")
<< QVideoFrame::Format_RGB32
<< QSize(2, 2)
@@ -400,7 +400,7 @@ void tst_QPainterVideoSurface::present_data()
<< int(sizeof(rgb565ImageData))
<< 4;
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
QTest::newRow("rgb24 -> rgb565")
<< QVideoFrame::Format_RGB24
<< QSize(2, 2)
@@ -580,7 +580,7 @@ void tst_QPainterVideoSurface::shaderType()
QCOMPARE(spy.count(), 0);
}
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
if (surface.supportedShaderTypes() & QPainterVideoSurface::FragmentProgramShader) {
QSignalSpy spy(&surface, SIGNAL(supportedFormatsChanged()));
@@ -625,7 +625,7 @@ void tst_QPainterVideoSurface::shaderType()
QCOMPARE(surface.shaderType(), QPainterVideoSurface::NoShaders);
QCOMPARE(spy.count(), 0);
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
surface.setShaderType(QPainterVideoSurface::FragmentProgramShader);
QCOMPARE(surface.shaderType(), QPainterVideoSurface::NoShaders);
QCOMPARE(spy.count(), 0);
@@ -641,7 +641,7 @@ void tst_QPainterVideoSurface::shaderTypeStarted_data()
{
QTest::addColumn<QPainterVideoSurface::ShaderType>("shaderType");
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
QTest::newRow("ARBfp")
<< QPainterVideoSurface::FragmentProgramShader;
#endif
@@ -729,7 +729,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data()
QList<QPair<QPainterVideoSurface::ShaderType, QByteArray> > types;
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
types << qMakePair(QPainterVideoSurface::FragmentProgramShader, QByteArray("ARBfp: "));
#endif
types << qMakePair(QPainterVideoSurface::GlslShader, QByteArray("GLSL: "));
@@ -776,7 +776,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data()
<< QAbstractVideoBuffer::NoHandle
<< QVideoFrame::Format_RGB24
<< QSize(1024, 768)
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
<< true
<< true;
#else
@@ -788,7 +788,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data()
<< QAbstractVideoBuffer::NoHandle
<< QVideoFrame::Format_RGB24
<< QSize(-1024, -768)
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
<< true
#else
<< false
@@ -949,7 +949,7 @@ void tst_QPainterVideoSurface::shaderPresent_data()
QTest::addColumn<int>("bytesPerLineB");
QList<QPair<QPainterVideoSurface::ShaderType, QByteArray> > types;
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
types << qMakePair(QPainterVideoSurface::FragmentProgramShader, QByteArray("ARBfp: "));
#endif
types << qMakePair(QPainterVideoSurface::GlslShader, QByteArray("GLSL: "));
@@ -1149,7 +1149,7 @@ void tst_QPainterVideoSurface::shaderPresentOpaqueFrame_data()
{
QTest::addColumn<QPainterVideoSurface::ShaderType>("shaderType");
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
QTest::newRow("ARBfp")
<< QPainterVideoSurface::FragmentProgramShader;
#endif
@@ -1203,7 +1203,7 @@ void tst_QPainterVideoSurface::shaderPresentGLFrame_data()
{
QTest::addColumn<QPainterVideoSurface::ShaderType>("shaderType");
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) && !defined(QT_OPENGL_ES2)
QTest::newRow("ARBfp")
<< QPainterVideoSurface::FragmentProgramShader;
#endif