diff options
Diffstat (limited to 'src/plugins')
4 files changed, 18 insertions, 19 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp index 9c2bb68bbe..14137f062c 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine.cpp @@ -545,6 +545,21 @@ void *QSGD3D12Engine::getResource(Resource resource) const return d->getResource(resource); } +QSGRendererInterface::ShaderType QSGD3D12Engine::shaderType() const +{ + return HLSL; +} + +QSGRendererInterface::ShaderCompilationTypes QSGD3D12Engine::shaderCompilationType() const +{ + return OfflineCompilation; +} + +QSGRendererInterface::ShaderSourceTypes QSGD3D12Engine::shaderSourceType() const +{ + return ShaderByteCode; +} + static inline quint32 alignedSize(quint32 size, quint32 byteAlign) { return (size + byteAlign - 1) & ~(byteAlign - 1); diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12engine_p.h b/src/plugins/scenegraph/d3d12/qsgd3d12engine_p.h index 07f2d360c8..2ebe1e733a 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12engine_p.h +++ b/src/plugins/scenegraph/d3d12/qsgd3d12engine_p.h @@ -375,6 +375,9 @@ public: // QSGRendererInterface GraphicsApi graphicsApi() const override; void *getResource(Resource resource) const override; + ShaderType shaderType() const override; + ShaderCompilationTypes shaderCompilationType() const override; + ShaderSourceTypes shaderSourceType() const override; private: QSGD3D12EnginePrivate *d; diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp index b5c0b1d903..f77719f876 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode.cpp @@ -770,21 +770,6 @@ void QSGD3D12ShaderEffectNode::preprocess() } } -QSGGuiThreadShaderEffectManager::ShaderType QSGD3D12GuiThreadShaderEffectManager::shaderType() const -{ - return HLSL; -} - -int QSGD3D12GuiThreadShaderEffectManager::shaderCompilationType() const -{ - return OfflineCompilation; -} - -int QSGD3D12GuiThreadShaderEffectManager::shaderSourceType() const -{ - return ShaderByteCode; -} - bool QSGD3D12GuiThreadShaderEffectManager::hasSeparateSamplerAndTextureObjects() const { return true; diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode_p.h b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode_p.h index 41d366abda..edeaba899b 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode_p.h +++ b/src/plugins/scenegraph/d3d12/qsgd3d12shadereffectnode_p.h @@ -155,10 +155,6 @@ private: class QSGD3D12GuiThreadShaderEffectManager : public QSGGuiThreadShaderEffectManager { public: - ShaderType shaderType() const override; - int shaderCompilationType() const override; - int shaderSourceType() const override; - bool hasSeparateSamplerAndTextureObjects() const override; QString log() const override; |