diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-12-13 12:07:18 +0100 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2020-01-06 15:17:09 +0100 |
commit | 0c2eaad357e555ccaf4fecf42aef03576bbae133 (patch) | |
tree | ea115a0d3e4e2d3dbdea54ba4818b6d6a25c45fe /tests/manual/scenegraph_lancelot/scenegraph | |
parent | cba6f48613fad1718edc5823b39bc4c7f7300dee (diff) |
Add RHI shaders to ShaderEffect test scenes
Add RHI versions of the fragment and vertex shaders in the lancelot
test scenes. Move all shaders into external files and include them as
resources, so that the automatic file selector mechanism will pick up
the right version at runtime.
Task-number: QTBUG-78683
Change-Id: I5eb1669d09a650301ac2a3012db8b3d1814c7bcb
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/manual/scenegraph_lancelot/scenegraph')
-rw-r--r-- | tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp index 3cc83e94da..a65bde1002 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp +++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp @@ -152,7 +152,7 @@ void tst_Scenegraph::testNoTextRendering() void tst_Scenegraph::testRendering_data() { - setupTestSuite(usingRhi ? "shaders/" : ""); // on RHI, skip shader effects tests for now + setupTestSuite(); consecutiveErrors = 0; aborted = false; } |