diff options
author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-06-04 20:32:07 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-27 08:20:25 +0000 |
commit | cb1bed53654bcfbea709ccd6666e045b68b1e4b8 (patch) | |
tree | 56b07bda9feac4d4f0851529168df850d927fe94 /tests/auto/quick/scenegraph/data | |
parent | f9c1b6e9c7ad3fbceef32590c5b7b6a9719fd453 (diff) |
Include the scenegraph autotest in the testrun.
The mipmap test has been updated to work on chips without npot, but
because it is failing in ci on some linux machines, we keep it enabled
for OSX and windows only.
The test also includes a dump of GPU capabilities to aid in debugging.
Change-Id: Ief3092b8e0502bea06aaf4a20c03b7edfa0b2403
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/scenegraph/data')
-rw-r--r-- | tests/auto/quick/scenegraph/data/mipmap_large.png | bin | 4465 -> 6536 bytes | |||
-rw-r--r-- | tests/auto/quick/scenegraph/data/mipmap_small.png | bin | 170 -> 124 bytes | |||
-rw-r--r-- | tests/auto/quick/scenegraph/data/render_Mipmap.qml | 9 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/quick/scenegraph/data/mipmap_large.png b/tests/auto/quick/scenegraph/data/mipmap_large.png Binary files differindex 9cb0fc7de1..1b6d99c45c 100644 --- a/tests/auto/quick/scenegraph/data/mipmap_large.png +++ b/tests/auto/quick/scenegraph/data/mipmap_large.png diff --git a/tests/auto/quick/scenegraph/data/mipmap_small.png b/tests/auto/quick/scenegraph/data/mipmap_small.png Binary files differindex dc5216fb6c..2e53012ef5 100644 --- a/tests/auto/quick/scenegraph/data/mipmap_small.png +++ b/tests/auto/quick/scenegraph/data/mipmap_small.png diff --git a/tests/auto/quick/scenegraph/data/render_Mipmap.qml b/tests/auto/quick/scenegraph/data/render_Mipmap.qml index 6d9191c5ac..9bd585373a 100644 --- a/tests/auto/quick/scenegraph/data/render_Mipmap.qml +++ b/tests/auto/quick/scenegraph/data/render_Mipmap.qml @@ -32,6 +32,7 @@ ****************************************************************************/ import QtQuick 2.3 +import QtQuick.Window 2.2 /* The test verifies that scaled down mipmapped images contains @@ -39,8 +40,8 @@ import QtQuick 2.3 #samples: 2 PixelPos R G B Error-tolerance - #final: 0 0 0.33 0.33 0.33 0.1 - #final: 1 0 0.33 0.33 0.33 0.1 + #final: 0 0 0.25 0.25 0.25 0.1 + #final: 1 0 0.25 0.25 0.25 0.1 */ RenderTestBase @@ -52,7 +53,7 @@ RenderTestBase source: "mipmap_small.png" mipmap: true smooth: false - scale: 1 / width; + scale: 1 / (width * Screen.devicePixelRatio); } Image { @@ -62,7 +63,7 @@ RenderTestBase source: "mipmap_large.png" mipmap: true smooth: false - scale: 1 / width; + scale: 1 / (width * Screen.devicePixelRatio); } onEnterFinalStage: finalStageComplete = true; |