summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2017-02-15 09:15:33 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-16 13:33:02 +0000
commit0b9f985454da517b0da01cb7df09cbe1d86e04ff (patch)
tree5ca5533a5e39924bddf9076a8da74cd9fed2f045
parenta8b868918beaa7349bdcfc42f688553a3007ffdb (diff)
Improve buffercapture-qml manual test
Task-number: QTBUG-58875 Change-Id: Ic030e6b9ab5e40d1131b80aa0d0a5d30d74d72b6 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
-rw-r--r--tests/manual/buffercapture-qml/BufferSetterScene.qml6
-rwxr-xr-xtests/manual/buffercapture-qml/bufferSetter.comp2
-rw-r--r--tests/manual/buffercapture-qml/main.cpp5
-rw-r--r--tests/manual/buffercapture-qml/main.qml2
4 files changed, 8 insertions, 7 deletions
diff --git a/tests/manual/buffercapture-qml/BufferSetterScene.qml b/tests/manual/buffercapture-qml/BufferSetterScene.qml
index 37f2858d6..530b73d43 100644
--- a/tests/manual/buffercapture-qml/BufferSetterScene.qml
+++ b/tests/manual/buffercapture-qml/BufferSetterScene.qml
@@ -60,8 +60,9 @@ Entity {
Camera {
id: sceneCamera
projectionType: CameraLens.PerspectiveProjection
- viewCenter: Qt.vector3d(0, 0, 0)
+ upVector: Qt.vector3d(0, 1, 0)
position: Qt.vector3d(0, 0, -800)
+ viewCenter: Qt.vector3d(0, 0, 0)
nearPlane: 0.1
farPlane: 1000
fieldOfView: 25
@@ -93,8 +94,7 @@ Entity {
objectName: "buffer"
type: Buffer.VertexBuffer
data: initGraphBuffer()
- access: Buffer.Read
- onDataAvailable: access = Buffer.Write
+ access: Buffer.ReadWrite
}
ComputeMaterial {
diff --git a/tests/manual/buffercapture-qml/bufferSetter.comp b/tests/manual/buffercapture-qml/bufferSetter.comp
index 4fd99bf33..d7c383669 100755
--- a/tests/manual/buffercapture-qml/bufferSetter.comp
+++ b/tests/manual/buffercapture-qml/bufferSetter.comp
@@ -62,5 +62,5 @@ layout (location=1) uniform int inputSize;
void main()
{
if (gl_GlobalInvocationID.x < inputSize)
- d[gl_GlobalInvocationID.x] = gl_GlobalInvocationID.x;
+ d[gl_GlobalInvocationID.x] = d[gl_GlobalInvocationID.x] + gl_GlobalInvocationID.x * 2;
}
diff --git a/tests/manual/buffercapture-qml/main.cpp b/tests/manual/buffercapture-qml/main.cpp
index cb6d6a489..6928c5724 100644
--- a/tests/manual/buffercapture-qml/main.cpp
+++ b/tests/manual/buffercapture-qml/main.cpp
@@ -66,7 +66,6 @@ int main(int argc, char* argv[])
view.setSource(QUrl("qrc:/main.qml"));
-
QObject *rootObject = view.rootObject();
Qt3DRender::QBuffer *buffer = rootObject->findChild<Qt3DRender::QBuffer*>("buffer");
@@ -74,9 +73,9 @@ int main(int argc, char* argv[])
[=](const QByteArray &bytes) {
//I know I'm receiving int data
const uint *data = reinterpret_cast<const uint*>(bytes.data());
- std::cout << "Data received" << std::endl;
+ qDebug() << "Data received";
for (uint i = 0; i < 1024; ++i)
- std::cout << data[i] << std::endl;
+ qDebug() << data[i];
}
);
diff --git a/tests/manual/buffercapture-qml/main.qml b/tests/manual/buffercapture-qml/main.qml
index 95859b576..a2680e921 100644
--- a/tests/manual/buffercapture-qml/main.qml
+++ b/tests/manual/buffercapture-qml/main.qml
@@ -54,6 +54,8 @@ import Qt3D.Render 2.0
import QtQuick.Scene3D 2.0
Item {
+ width: 128
+ height: width
Scene3D {
anchors.fill: parent
BufferSetterScene {