qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Temporarily mark grab()/item.layer tests insignificant under ANGLE" 

This reverts commit 6b31418a1b.

These tests now pass with the latest ANGLE.

Change-Id: If812d430e69f0d39a970e9119ebc1f2e5b4886dc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Andrew Knight 2014-09-24 10:29:39 +03:00
parent da15a19b3f
commit d5b10eda96
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/quick/qquickitem2/tst_qquickitem.cpp
View File

@ -2806,9 +2806,6 @@ void tst_QQuickItem::childAt()
void tst_QQuickItem::grab()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
QQuickView view;
view.setSource(testFileUrl("grabToImage.qml"));
view.show();

33
tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
View File

@ -130,9 +130,6 @@ tst_QQuickItemLayer::tst_QQuickItemLayer()
void tst_QQuickItemLayer::layerSmooth()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
QImage fb = runTest("Smooth.qml");
@ -152,9 +149,6 @@ void tst_QQuickItemLayer::layerSmooth()
void tst_QQuickItemLayer::layerEnabled()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
QImage fb = runTest("Enabled.qml");
@ -171,9 +165,6 @@ void tst_QQuickItemLayer::layerEnabled()
void tst_QQuickItemLayer::layerMipmap()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer)
QSKIP("Mipmapping does not work with the Mesa Software Rasterizer.");
QImage fb = runTest("Mipmap.qml");
@ -188,9 +179,6 @@ void tst_QQuickItemLayer::layerMipmap()
void tst_QQuickItemLayer::layerEffect()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
QImage fb = runTest("Effect.qml");
@ -205,9 +193,6 @@ void tst_QQuickItemLayer::layerEffect()
// a shader that pads transparent to blue. Everything else is red.
void tst_QQuickItemLayer::layerSourceRect()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
@ -229,9 +214,6 @@ void tst_QQuickItemLayer::layerSourceRect()
// directly in a stand alone ShaderEffect
void tst_QQuickItemLayer::layerIsTextureProvider()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
QImage fb = runTest("TextureProvider.qml");
@ -264,9 +246,6 @@ void tst_QQuickItemLayer::layerVisibility_data()
void tst_QQuickItemLayer::layerVisibility()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
@ -315,9 +294,6 @@ void tst_QQuickItemLayer::layerZOrder_data()
void tst_QQuickItemLayer::layerZOrder()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
@ -352,9 +328,6 @@ void tst_QQuickItemLayer::changeZOrder_data()
void tst_QQuickItemLayer::changeZOrder()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
@ -423,9 +396,6 @@ void tst_QQuickItemLayer::disableLayer()
void tst_QQuickItemLayer::changeSamplerName()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
QImage fb = runTest("SamplerNameChange.qml");
@ -434,9 +404,6 @@ void tst_QQuickItemLayer::changeSamplerName()
void tst_QQuickItemLayer::itemEffect()
{
#if defined(Q_OS_WIN32) && defined(QT_OPENGL_ES_2_ANGLE)
QSKIP("QTBUG-40649");
#endif
if (m_isMesaSoftwareRasterizer && m_mesaVersion < QT_VERSION_CHECK(7, 11, 0))
QSKIP("Mesa Software Rasterizer below version 7.11 does not render this test correctly.");
QImage fb = runTest("ItemEffect.qml");