summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMäättä Antti <antti.maatta@qt.io>2017-11-10 15:28:49 +0200
committerAntti Määttä <antti.maatta@qt.io>2018-01-03 08:20:52 +0000
commit1f1d545ea692c7ea6dd052d2fb7df1a98a22d070 (patch)
treeaa858e8efe7d986640246d89334e7abed1a537c5 /tests
parent18db316919aa01a997be20afa7f63bb5c541000b (diff)
Fix running autotests on CI
Autotests need to build against the q3dsruntime dll and not the static runtime library. Add dll exports to functions needed by the autotests. Also stop using runtime logging in the autotests and use qWarning instead. Change-Id: Ia077e3c171f86f4d4459a109599d20c0ba006e37 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro12
-rw-r--r--tests/auto/runtime/Qt3DSRenderTestBase.cpp29
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestAtomicCounterBuffer.cpp6
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestAttribBuffers.cpp6
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestBackendQuery.cpp12
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestConstantBuffer.cpp20
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestDrawIndirectBuffer.cpp14
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestPrimitives.cpp6
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestProgramPipeline.cpp16
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestTexture2D.cpp4
-rw-r--r--tests/auto/runtime/base/Qt3DSRenderTestTimerQuery.cpp12
-rw-r--r--tests/auto/runtime/compute/Qt3DSRenderTestComputeShader.cpp20
-rw-r--r--tests/auto/runtime/fbo/Qt3DSRenderTestFboMsaa.cpp4
-rw-r--r--tests/auto/runtime/geometry/Qt3DSRenderTestGeometryShader.cpp8
-rw-r--r--tests/auto/runtime/geometry/Qt3DSRenderTestOcclusionQuery.cpp8
-rw-r--r--tests/auto/runtime/geometry/Qt3DSRenderTestTessellation.cpp8
-rw-r--r--tests/auto/runtime/runtime.pro11
-rw-r--r--tests/tests.pro5
18 files changed, 111 insertions, 90 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 5967855d..3d6dac63 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,8 +1,10 @@
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS += \
- runtime \
- viewer \
- qtextras \
- studio3d
+!macos: SUBDIRS += \
+ qtextras
+
+# TODO: Re-enable these tests after fixing them
+# runtime \
+# viewer \
+# studio3d
diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.cpp b/tests/auto/runtime/Qt3DSRenderTestBase.cpp
index 1c571fd0..5892e67e 100644
--- a/tests/auto/runtime/Qt3DSRenderTestBase.cpp
+++ b/tests/auto/runtime/Qt3DSRenderTestBase.cpp
@@ -28,6 +28,35 @@
#include "Qt3DSRenderTestBase.h"
+#include "Qt3DSDMPrefix.h"
+#include "EASTL/allocator.h"
+
+namespace eastl
+{
+void AssertionFailure(const char* pExpression)
+{
+ Q_UNUSED(pExpression);
+}
+EmptyString gEmptyString;
+void* gpEmptyBucketArray[2] = { nullptr, (void*)uintptr_t(~0) };
+}
+
+namespace qt3ds {
+namespace render {
+SEndlType Endl;
+}
+}
+
+void *operator new[](size_t size, const char *, int, unsigned, const char *, int)
+{
+ return malloc(size);
+}
+
+void *operator new[](size_t size, size_t, size_t, const char *, int, unsigned, const char *, int)
+{
+ return malloc(size);
+}
+
using namespace qt3ds::render;
namespace qt3ds {
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestAtomicCounterBuffer.cpp b/tests/auto/runtime/base/Qt3DSRenderTestAtomicCounterBuffer.cpp
index ee108230..9f81214f 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestAtomicCounterBuffer.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestAtomicCounterBuffer.cpp
@@ -152,7 +152,7 @@ bool NVRenderTestAtomicCounterBuffer::rasterizerTest(NVRenderContext *context,
mAtomicCounterBuffer = context->CreateAtomicCounterBuffer(
"ac_buffer", NVRenderBufferUsageType::Static, sizeof(QT3DSU32), acData);
if (!mAtomicCounterBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create atomic counter buffer";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create atomic counter buffer";
return false;
}
// add a parameter
@@ -190,7 +190,7 @@ bool NVRenderTestAtomicCounterBuffer::rasterizerTest(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
return false;
}
@@ -203,7 +203,7 @@ bool NVRenderTestAtomicCounterBuffer::rasterizerTest(NVRenderContext *context,
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create input assembler";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestAttribBuffers.cpp b/tests/auto/runtime/base/Qt3DSRenderTestAttribBuffers.cpp
index f8f97533..805782f7 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestAttribBuffers.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestAttribBuffers.cpp
@@ -179,7 +179,7 @@ bool NVRenderTestAttribBuffers::multiAttribBufferTest(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create vertex buffer";
return false;
}
// color buffer
@@ -187,7 +187,7 @@ bool NVRenderTestAttribBuffers::multiAttribBufferTest(NVRenderContext *context,
mColorBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), colorData);
if (!mColorBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create color buffer";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create color buffer";
return false;
}
@@ -208,7 +208,7 @@ bool NVRenderTestAttribBuffers::multiAttribBufferTest(NVRenderContext *context,
mAttribLayout, NVConstDataRef<NVRenderVertexBuffer *>(attribBuffers, 2), NULL,
toConstDataRef(strides, 2), toConstDataRef(offsets, 2), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create input assembler";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestBackendQuery.cpp b/tests/auto/runtime/base/Qt3DSRenderTestBackendQuery.cpp
index 1ec8830a..30f26378 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestBackendQuery.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestBackendQuery.cpp
@@ -148,7 +148,7 @@ bool NVRenderTestBackendQuery::renderQuad(NVRenderContext *context, userContextD
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestBackendQuery::depthBitsTest: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestBackendQuery::depthBitsTest: Failed to create vertex buffer";
return false;
}
@@ -161,7 +161,7 @@ bool NVRenderTestBackendQuery::renderQuad(NVRenderContext *context, userContextD
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestBackendQuery::depthBitsTest: Failed to create input assembler";
+ qWarning() << "NVRenderTestBackendQuery::depthBitsTest: Failed to create input assembler";
return false;
}
@@ -235,7 +235,7 @@ bool NVRenderTestBackendQuery::depthBitsFBOTest(NVRenderContext *context,
NVRenderTextureOrRenderBuffer(*m_Depth16Texture));
if (!m_FBO->IsComplete()) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
+ qWarning() << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
return false;
}
@@ -256,7 +256,7 @@ bool NVRenderTestBackendQuery::depthBitsFBOTest(NVRenderContext *context,
m_FBO->Attach(NVRenderFrameBufferAttachments::Depth,
NVRenderTextureOrRenderBuffer(*m_Depth24Texture));
if (!m_FBO->IsComplete()) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
+ qWarning() << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
return false;
}
// check depth bit count
@@ -273,7 +273,7 @@ bool NVRenderTestBackendQuery::depthBitsFBOTest(NVRenderContext *context,
m_FBO->Attach(NVRenderFrameBufferAttachments::Depth,
NVRenderTextureOrRenderBuffer(*m_Depth32Texture));
if (!m_FBO->IsComplete()) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
+ qWarning() << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
return false;
}
// check depth bit count
@@ -292,7 +292,7 @@ bool NVRenderTestBackendQuery::depthBitsFBOTest(NVRenderContext *context,
m_FBO->Attach(NVRenderFrameBufferAttachments::DepthStencil,
NVRenderTextureOrRenderBuffer(*m_Depth24Stencil8Texture));
if (!m_FBO->IsComplete()) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
+ qWarning() << "NVRenderTestBackendQuery::depthBitsFBOTest: Failed to create FBO";
return false;
}
// check depth bit count
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestConstantBuffer.cpp b/tests/auto/runtime/base/Qt3DSRenderTestConstantBuffer.cpp
index 93836205..8b6cb344 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestConstantBuffer.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestConstantBuffer.cpp
@@ -359,7 +359,7 @@ bool NVRenderTestConstantBuffer::scalarTest(NVRenderContext *context, userContex
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::scalarTest: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestConstantBuffer::scalarTest: Failed to create vertex buffer";
return false;
}
@@ -372,7 +372,7 @@ bool NVRenderTestConstantBuffer::scalarTest(NVRenderContext *context, userContex
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::scalarTest: Failed to create input assembler";
+ qWarning() << "NVRenderTestConstantBuffer::scalarTest: Failed to create input assembler";
return false;
}
@@ -464,7 +464,7 @@ bool NVRenderTestConstantBuffer::vectorTest(NVRenderContext *context, userContex
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::vectorTest: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestConstantBuffer::vectorTest: Failed to create vertex buffer";
return false;
}
@@ -477,7 +477,7 @@ bool NVRenderTestConstantBuffer::vectorTest(NVRenderContext *context, userContex
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::vectorTest: Failed to create input assembler";
+ qWarning() << "NVRenderTestConstantBuffer::vectorTest: Failed to create input assembler";
return false;
}
@@ -571,7 +571,7 @@ bool NVRenderTestConstantBuffer::structTest(NVRenderContext *context, userContex
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::structTest: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestConstantBuffer::structTest: Failed to create vertex buffer";
return false;
}
@@ -584,7 +584,7 @@ bool NVRenderTestConstantBuffer::structTest(NVRenderContext *context, userContex
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::structTest: Failed to create input assembler";
+ qWarning() << "NVRenderTestConstantBuffer::structTest: Failed to create input assembler";
return false;
}
@@ -674,7 +674,7 @@ bool NVRenderTestConstantBuffer::rawTest(NVRenderContext *context, userContextDa
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::rawTest: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestConstantBuffer::rawTest: Failed to create vertex buffer";
return false;
}
@@ -687,7 +687,7 @@ bool NVRenderTestConstantBuffer::rawTest(NVRenderContext *context, userContextDa
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::rawTest: Failed to create input assembler";
+ qWarning() << "NVRenderTestConstantBuffer::rawTest: Failed to create input assembler";
return false;
}
@@ -785,7 +785,7 @@ bool NVRenderTestConstantBuffer::multiCBTest(NVRenderContext *context, userConte
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::scalarTest: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestConstantBuffer::scalarTest: Failed to create vertex buffer";
return false;
}
@@ -798,7 +798,7 @@ bool NVRenderTestConstantBuffer::multiCBTest(NVRenderContext *context, userConte
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestConstantBuffer::scalarTest: Failed to create input assembler";
+ qWarning() << "NVRenderTestConstantBuffer::scalarTest: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestDrawIndirectBuffer.cpp b/tests/auto/runtime/base/Qt3DSRenderTestDrawIndirectBuffer.cpp
index b12976c6..4b8044d3 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestDrawIndirectBuffer.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestDrawIndirectBuffer.cpp
@@ -175,7 +175,7 @@ bool NVRenderTestDrawIndirectBuffer::drawArrayIndirect(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
return false;
}
@@ -188,7 +188,7 @@ bool NVRenderTestDrawIndirectBuffer::drawArrayIndirect(NVRenderContext *context,
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), NULL, toConstDataRef(&strides, 1),
toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create input assembler";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create input assembler";
return false;
}
@@ -204,7 +204,7 @@ bool NVRenderTestDrawIndirectBuffer::drawArrayIndirect(NVRenderContext *context,
commandBufSize, commandData);
if (!mDrawIndirectBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
return false;
}
@@ -274,7 +274,7 @@ bool NVRenderTestDrawIndirectBuffer::drawElementsIndirect(NVRenderContext *conte
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
return false;
}
@@ -285,7 +285,7 @@ bool NVRenderTestDrawIndirectBuffer::drawElementsIndirect(NVRenderContext *conte
NVRenderBufferUsageType::Static, NVRenderComponentTypes::QT3DSU16, bufSize,
NVConstDataRef<QT3DSU8>(reinterpret_cast<const QT3DSU8 *>(indices), bufSize));
if (!mIndexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestPrimitives::Triangles: Failed to create index buffer";
+ qWarning() << "NVRenderTestPrimitives::Triangles: Failed to create index buffer";
return false;
}
@@ -298,7 +298,7 @@ bool NVRenderTestDrawIndirectBuffer::drawElementsIndirect(NVRenderContext *conte
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create input assembler";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create input assembler";
return false;
}
@@ -315,7 +315,7 @@ bool NVRenderTestDrawIndirectBuffer::drawElementsIndirect(NVRenderContext *conte
commandBufSize, commandData);
if (!mDrawIndirectBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAtomicCounterBuffer: Failed to create vertex buffer";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestPrimitives.cpp b/tests/auto/runtime/base/Qt3DSRenderTestPrimitives.cpp
index c0cdc9e3..d3c2423b 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestPrimitives.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestPrimitives.cpp
@@ -121,7 +121,7 @@ bool NVRenderTestPrimitives::renderPrimitive(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestPrimitives::Triangles: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestPrimitives::Triangles: Failed to create vertex buffer";
return false;
}
@@ -133,7 +133,7 @@ bool NVRenderTestPrimitives::renderPrimitive(NVRenderContext *context,
NVRenderBufferUsageType::Static, NVRenderComponentTypes::QT3DSU16, bufSize,
NVConstDataRef<QT3DSU8>(reinterpret_cast<const QT3DSU8 *>(pIndexData), bufSize));
if (!mIndexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestPrimitives::Triangles: Failed to create index buffer";
+ qWarning() << "NVRenderTestPrimitives::Triangles: Failed to create index buffer";
return false;
}
}
@@ -147,7 +147,7 @@ bool NVRenderTestPrimitives::renderPrimitive(NVRenderContext *context,
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestPrimitives::Triangles: Failed to create inout assembler";
+ qWarning() << "NVRenderTestPrimitives::Triangles: Failed to create inout assembler";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestProgramPipeline.cpp b/tests/auto/runtime/base/Qt3DSRenderTestProgramPipeline.cpp
index b08dec27..a76bfa05 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestProgramPipeline.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestProgramPipeline.cpp
@@ -181,7 +181,7 @@ bool NVRenderTestProgramPipeline::vertFragSeparateTest(NVRenderContext *context,
// setup program pipeline
mProgramPipeline = context->CreateProgramPipeline();
if (!mProgramPipeline) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestProgramPipeline: Failed to create program pipeline";
+ qWarning() << "NVRenderTestProgramPipeline: Failed to create program pipeline";
return false;
}
@@ -212,7 +212,7 @@ bool NVRenderTestProgramPipeline::vertFragSeparateTest(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create vertex buffer";
return false;
}
// color buffer
@@ -220,7 +220,7 @@ bool NVRenderTestProgramPipeline::vertFragSeparateTest(NVRenderContext *context,
mColorBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), colorData);
if (!mColorBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create color buffer";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create color buffer";
return false;
}
@@ -241,7 +241,7 @@ bool NVRenderTestProgramPipeline::vertFragSeparateTest(NVRenderContext *context,
mAttribLayout, NVConstDataRef<NVRenderVertexBuffer *>(attribBuffers, 2), NULL,
toConstDataRef(strides, 2), toConstDataRef(offsets, 2), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create input assembler";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create input assembler";
return false;
}
@@ -299,7 +299,7 @@ bool NVRenderTestProgramPipeline::vertFragCombinedTest(NVRenderContext *context,
// setup program pipeline
mProgramPipeline = context->CreateProgramPipeline();
if (!mProgramPipeline) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestProgramPipeline: Failed to create program pipeline";
+ qWarning() << "NVRenderTestProgramPipeline: Failed to create program pipeline";
return false;
}
@@ -329,7 +329,7 @@ bool NVRenderTestProgramPipeline::vertFragCombinedTest(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create vertex buffer";
return false;
}
// color buffer
@@ -337,7 +337,7 @@ bool NVRenderTestProgramPipeline::vertFragCombinedTest(NVRenderContext *context,
mColorBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), colorData);
if (!mColorBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create color buffer";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create color buffer";
return false;
}
@@ -358,7 +358,7 @@ bool NVRenderTestProgramPipeline::vertFragCombinedTest(NVRenderContext *context,
mAttribLayout, NVConstDataRef<NVRenderVertexBuffer *>(attribBuffers, 2), NULL,
toConstDataRef(strides, 2), toConstDataRef(offsets, 2), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestAttribBuffers: Failed to create input assembler";
+ qWarning() << "NVRenderTestAttribBuffers: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestTexture2D.cpp b/tests/auto/runtime/base/Qt3DSRenderTestTexture2D.cpp
index 525f1f4e..6904955f 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestTexture2D.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestTexture2D.cpp
@@ -216,7 +216,7 @@ bool NVRenderTestTexture2D::renderTexArrayQuad(NVRenderContext *context, userCon
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
6 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTexture2D: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestTexture2D: Failed to create vertex buffer";
return false;
}
@@ -229,7 +229,7 @@ bool NVRenderTestTexture2D::renderTexArrayQuad(NVRenderContext *context, userCon
context->CreateInputAssembler(mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), NULL,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTexture2D: Failed to create input assembler";
+ qWarning() << "NVRenderTestTexture2D: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/base/Qt3DSRenderTestTimerQuery.cpp b/tests/auto/runtime/base/Qt3DSRenderTestTimerQuery.cpp
index bd595983..bf8ff0e3 100644
--- a/tests/auto/runtime/base/Qt3DSRenderTestTimerQuery.cpp
+++ b/tests/auto/runtime/base/Qt3DSRenderTestTimerQuery.cpp
@@ -170,7 +170,7 @@ bool NVRenderTestTimerQuery::renderQuad(NVRenderContext *context, userContextDat
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTimerQuery: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestTimerQuery: Failed to create vertex buffer";
return false;
}
@@ -183,7 +183,7 @@ bool NVRenderTestTimerQuery::renderQuad(NVRenderContext *context, userContextDat
context->CreateInputAssembler(mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), NULL,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTimerQuery: Failed to create input assembler";
+ qWarning() << "NVRenderTestTimerQuery: Failed to create input assembler";
return false;
}
@@ -247,7 +247,7 @@ bool NVRenderTestTimerQuery::timerTest(NVRenderContext *context, userContextData
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTimerQuery: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestTimerQuery: Failed to create vertex buffer";
return false;
}
@@ -260,7 +260,7 @@ bool NVRenderTestTimerQuery::timerTest(NVRenderContext *context, userContextData
context->CreateInputAssembler(mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), NULL,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTimerQuery: Failed to create input assembler";
+ qWarning() << "NVRenderTestTimerQuery: Failed to create input assembler";
return false;
}
@@ -350,7 +350,7 @@ bool NVRenderTestTimerQuery::absoluteTimerTest(NVRenderContext *context, userCon
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTimerQuery: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestTimerQuery: Failed to create vertex buffer";
return false;
}
@@ -363,7 +363,7 @@ bool NVRenderTestTimerQuery::absoluteTimerTest(NVRenderContext *context, userCon
context->CreateInputAssembler(mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), NULL,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestTimerQuery: Failed to create input assembler";
+ qWarning() << "NVRenderTestTimerQuery: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/compute/Qt3DSRenderTestComputeShader.cpp b/tests/auto/runtime/compute/Qt3DSRenderTestComputeShader.cpp
index f00d648f..15035b43 100644
--- a/tests/auto/runtime/compute/Qt3DSRenderTestComputeShader.cpp
+++ b/tests/auto/runtime/compute/Qt3DSRenderTestComputeShader.cpp
@@ -297,7 +297,7 @@ bool NVRenderTestComputeShader::computeCompile(NVRenderContext *context, userCon
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
5 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestComputeShader: Failed to create vertex buffer";
return false;
}
@@ -310,7 +310,7 @@ bool NVRenderTestComputeShader::computeCompile(NVRenderContext *context, userCon
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create input assembler";
+ qWarning() << "NVRenderTestComputeShader: Failed to create input assembler";
return false;
}
@@ -406,7 +406,7 @@ bool NVRenderTestComputeShader::computeWorkgroup(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
5 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestComputeShader: Failed to create vertex buffer";
return false;
}
@@ -419,7 +419,7 @@ bool NVRenderTestComputeShader::computeWorkgroup(NVRenderContext *context,
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create input assembler";
+ qWarning() << "NVRenderTestComputeShader: Failed to create input assembler";
return false;
}
@@ -429,7 +429,7 @@ bool NVRenderTestComputeShader::computeWorkgroup(NVRenderContext *context,
"Compute workgroup shader", toRef(computeWorkShader(computeProg, isGLESContext(context))));
if (!computeResult.mShader) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create compute shader";
+ qWarning() << "NVRenderTestComputeShader: Failed to create compute shader";
return false;
}
@@ -493,7 +493,7 @@ bool NVRenderTestComputeShader::computeStorage(NVRenderContext *context, userCon
mComputeVertexBuffer = context->CreateVertexBuffer(
NVRenderBufferUsageType::Static, 1000 * sizeof(QT3DSF32) * 4, sizeof(QT3DSF32), storData);
if (!mComputeVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create compute vertex buffer";
+ qWarning() << "NVRenderTestComputeShader: Failed to create compute vertex buffer";
return false;
}
// create storage wrapper for vertex buffer
@@ -502,7 +502,7 @@ bool NVRenderTestComputeShader::computeStorage(NVRenderContext *context, userCon
context->CreateStorageBuffer("Pos", NVRenderBufferUsageType::Static,
1000 * sizeof(QT3DSF32) * 4, storData, mComputeVertexBuffer.mPtr);
if (!mComputeStorageBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create compute storage buffer";
+ qWarning() << "NVRenderTestComputeShader: Failed to create compute storage buffer";
return false;
}
@@ -536,7 +536,7 @@ bool NVRenderTestComputeShader::computeStorage(NVRenderContext *context, userCon
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
5 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestComputeShader: Failed to create vertex buffer";
return false;
}
@@ -549,7 +549,7 @@ bool NVRenderTestComputeShader::computeStorage(NVRenderContext *context, userCon
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create input assembler";
+ qWarning() << "NVRenderTestComputeShader: Failed to create input assembler";
return false;
}
@@ -559,7 +559,7 @@ bool NVRenderTestComputeShader::computeStorage(NVRenderContext *context, userCon
"Compute storage shader", toRef(computeStorageShader(computeProg, isGLESContext(context))));
if (!computeResult.mShader) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestComputeShader: Failed to create compute shader";
+ qWarning() << "NVRenderTestComputeShader: Failed to create compute shader";
return false;
}
diff --git a/tests/auto/runtime/fbo/Qt3DSRenderTestFboMsaa.cpp b/tests/auto/runtime/fbo/Qt3DSRenderTestFboMsaa.cpp
index 32c5e122..400cfc51 100644
--- a/tests/auto/runtime/fbo/Qt3DSRenderTestFboMsaa.cpp
+++ b/tests/auto/runtime/fbo/Qt3DSRenderTestFboMsaa.cpp
@@ -153,7 +153,7 @@ bool NVRenderTestFboMsaa::renderTriangle(NVRenderContext *context, QT3DSVec3 col
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestFboMsaa: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestFboMsaa: Failed to create vertex buffer";
return false;
}
@@ -166,7 +166,7 @@ bool NVRenderTestFboMsaa::renderTriangle(NVRenderContext *context, QT3DSVec3 col
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestFboMsaa: Failed to create input assembler";
+ qWarning() << "NVRenderTestFboMsaa: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/geometry/Qt3DSRenderTestGeometryShader.cpp b/tests/auto/runtime/geometry/Qt3DSRenderTestGeometryShader.cpp
index ef266ad8..1a1c34c5 100644
--- a/tests/auto/runtime/geometry/Qt3DSRenderTestGeometryShader.cpp
+++ b/tests/auto/runtime/geometry/Qt3DSRenderTestGeometryShader.cpp
@@ -231,7 +231,7 @@ bool NVRenderTestGeometryShader::geometryCompile(NVRenderContext *context,
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
5 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestGeometryShader: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestGeometryShader: Failed to create vertex buffer";
return false;
}
@@ -244,7 +244,7 @@ bool NVRenderTestGeometryShader::geometryCompile(NVRenderContext *context,
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestGeometryShader: Failed to create input assembler";
+ qWarning() << "NVRenderTestGeometryShader: Failed to create input assembler";
return false;
}
@@ -333,7 +333,7 @@ bool NVRenderTestGeometryShader::wireframe(NVRenderContext *context, userContext
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
5 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestGeometryShader: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestGeometryShader: Failed to create vertex buffer";
return false;
}
@@ -346,7 +346,7 @@ bool NVRenderTestGeometryShader::wireframe(NVRenderContext *context, userContext
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Triangles);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestGeometryShader: Failed to create input assembler";
+ qWarning() << "NVRenderTestGeometryShader: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/geometry/Qt3DSRenderTestOcclusionQuery.cpp b/tests/auto/runtime/geometry/Qt3DSRenderTestOcclusionQuery.cpp
index 34cfe860..1bb0b160 100644
--- a/tests/auto/runtime/geometry/Qt3DSRenderTestOcclusionQuery.cpp
+++ b/tests/auto/runtime/geometry/Qt3DSRenderTestOcclusionQuery.cpp
@@ -178,7 +178,7 @@ bool NVRenderTestOcclusionQuery::renderQuad(NVRenderContext *context, userContex
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
3 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestOcclusionQuery: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestOcclusionQuery: Failed to create vertex buffer";
return false;
}
@@ -191,7 +191,7 @@ bool NVRenderTestOcclusionQuery::renderQuad(NVRenderContext *context, userContex
context->CreateInputAssembler(mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), NULL,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestOcclusionQuery: Failed to create input assembler";
+ qWarning() << "NVRenderTestOcclusionQuery: Failed to create input assembler";
return false;
}
@@ -260,7 +260,7 @@ void NVRenderTestOcclusionQuery::renderPrim(NVRenderContext *context, userContex
mVB = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize, 3 * sizeof(QT3DSF32),
vertDataSmall);
if (!mVB)
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestOcclusionQuery: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestOcclusionQuery: Failed to create vertex buffer";
// create our attribute layout
mAttribLayout = context->CreateAttributeLayout(toConstDataRef(entries, 1));
@@ -270,7 +270,7 @@ void NVRenderTestOcclusionQuery::renderPrim(NVRenderContext *context, userContex
mIA = context->CreateInputAssembler(mAttribLayout, toConstDataRef(&mVB.mPtr, 1), NULL,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1));
if (!mVB) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestOcclusionQuery: Failed to create input assembler";
+ qWarning() << "NVRenderTestOcclusionQuery: Failed to create input assembler";
return;
}
diff --git a/tests/auto/runtime/geometry/Qt3DSRenderTestTessellation.cpp b/tests/auto/runtime/geometry/Qt3DSRenderTestTessellation.cpp
index 655dc9f5..f2724a4a 100644
--- a/tests/auto/runtime/geometry/Qt3DSRenderTestTessellation.cpp
+++ b/tests/auto/runtime/geometry/Qt3DSRenderTestTessellation.cpp
@@ -393,7 +393,7 @@ bool NVRenderTestTessellation::trianglePatches(NVRenderContext *context, userCon
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
6 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestFboMsaa: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestFboMsaa: Failed to create vertex buffer";
return false;
}
@@ -406,7 +406,7 @@ bool NVRenderTestTessellation::trianglePatches(NVRenderContext *context, userCon
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Patches, 3);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestFboMsaa: Failed to create input assembler";
+ qWarning() << "NVRenderTestFboMsaa: Failed to create input assembler";
return false;
}
@@ -499,7 +499,7 @@ bool NVRenderTestTessellation::phongPatches(NVRenderContext *context, userContex
mVertexBuffer = context->CreateVertexBuffer(NVRenderBufferUsageType::Static, bufSize,
6 * sizeof(QT3DSF32), vertData);
if (!mVertexBuffer) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestFboMsaa: Failed to create vertex buffer";
+ qWarning() << "NVRenderTestFboMsaa: Failed to create vertex buffer";
return false;
}
@@ -512,7 +512,7 @@ bool NVRenderTestTessellation::phongPatches(NVRenderContext *context, userContex
mAttribLayout, toConstDataRef(&mVertexBuffer.mPtr, 1), mIndexBuffer.mPtr,
toConstDataRef(&strides, 1), toConstDataRef(&offsets, 1), NVRenderDrawMode::Patches, 3);
if (!mInputAssembler) {
- qCInfo(qt3ds::TRACE_INFO) << "NVRenderTestFboMsaa: Failed to create input assembler";
+ qWarning() << "NVRenderTestFboMsaa: Failed to create input assembler";
return false;
}
diff --git a/tests/auto/runtime/runtime.pro b/tests/auto/runtime/runtime.pro
index 35492b53..3b2540e1 100644
--- a/tests/auto/runtime/runtime.pro
+++ b/tests/auto/runtime/runtime.pro
@@ -64,11 +64,7 @@ linux {
}
LIBS += \
- $$BEGIN_ARCHIVE \
- -lqt3dsruntimestatic$$qtPlatformTargetSuffix() \
- -lEASTL$$qtPlatformTargetSuffix() \
- -lLua$$qtPlatformTargetSuffix() \
- $$END_ARCHIVE \
+ -lqt3dsruntime$$qtPlatformTargetSuffix() \
-lqt3dsqmlstreamer$$qtPlatformTargetSuffix()
ANDROID_EXTRA_LIBS = \
@@ -84,8 +80,3 @@ linux {
-ldl \
-lEGL
}
-
-PREDEPS_LIBS = qt3dsruntimestatic
-
-include($$PWD/../../../src/utils.pri)
-PRE_TARGETDEPS += $$fixLibPredeps($$LIBDIR, PREDEPS_LIBS)
diff --git a/tests/tests.pro b/tests/tests.pro
index 1e5f93f9..c458bbbe 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,5 +1,4 @@
TEMPLATE = subdirs
-# disable autotests for now
-#!package: SUBDIRS += \
-# auto
+!package: SUBDIRS += \
+ auto