diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-26 12:47:59 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-29 09:36:36 +0000 |
| commit | 96cdc5be2aa0cf87033591cfd76661291b3f6933 (patch) | |
| tree | feac67a35952fcaf9b64db0a4b227957852b66d0 /src/quick/scenegraph/qsgadaptationlayer.cpp | |
| parent | e88e2940598086b57e6c844afa2eca4153d0f528 (diff) | |
D3D12: Long Live Wobble!
D3D12 shader effect node.
Cull mode, atlas (qt_SubRect_*) support, and some nice-to-haves are
currently missing. The built-in shaders won't yet work due to not sending
'source' down the stack so both have to be application-supplied.
Nonetheless..the wobble test works!
Change-Id: If4cd0143fa5794a8d5f89b576ffcfb084efeb343
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgadaptationlayer.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgadaptationlayer.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp index b0259c50b0..50986e2528 100644 --- a/src/quick/scenegraph/qsgadaptationlayer.cpp +++ b/src/quick/scenegraph/qsgadaptationlayer.cpp @@ -522,11 +522,16 @@ void QSGNodeVisitorEx::visitChildren(QSGNode *node) #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug debug, const QSGGuiThreadShaderEffectManager::ShaderInfo::InputParameter &p) { - debug << p.semanticName << p.semanticIndex; + QDebugStateSaver saver(debug); + debug.space(); + debug << p.semanticName << "semindex" << p.semanticIndex; return debug; } + QDebug operator<<(QDebug debug, const QSGGuiThreadShaderEffectManager::ShaderInfo::Variable &v) { + QDebugStateSaver saver(debug); + debug.space(); debug << v.name; switch (v.type) { case QSGGuiThreadShaderEffectManager::ShaderInfo::Constant: @@ -543,6 +548,14 @@ QDebug operator<<(QDebug debug, const QSGGuiThreadShaderEffectManager::ShaderInf } return debug; } + +QDebug operator<<(QDebug debug, const QSGShaderEffectNode::VariableData &vd) +{ + QDebugStateSaver saver(debug); + debug.space(); + debug << vd.specialType; + return debug; +} #endif QT_END_NAMESPACE |