diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-26 16:04:03 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-06-01 10:32:18 +0000 |
| commit | 1c6d4353f742a740e54b234db4d7b8913d515376 (patch) | |
| tree | 2b0a7602cd96345240f3b021e4453ca560e932c1 /src/quick/items/qquickgenericshadereffect.cpp | |
| parent | a6d3e3afcdd8f08893cff4deed7e866a5daf3cbd (diff) | |
One GraphicsInfo to rule them all
Rename RendererInfo to GraphicsInfo. Deprecate OpenGLInfo and move
the surface format properties into GraphicsInfo. Move also the
shader info properties from ShaderEffect.
Change-Id: I3b3f01080e059b3a30a132fd67de19a4bfca54ef
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickgenericshadereffect.cpp')
| -rw-r--r-- | src/quick/items/qquickgenericshadereffect.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/quick/items/qquickgenericshadereffect.cpp b/src/quick/items/qquickgenericshadereffect.cpp index cad3520ed1..47272a2eac 100644 --- a/src/quick/items/qquickgenericshadereffect.cpp +++ b/src/quick/items/qquickgenericshadereffect.cpp @@ -202,33 +202,6 @@ QQuickShaderEffect::Status QQuickGenericShaderEffect::status() const return QQuickShaderEffect::Status(mgr->status()); } -QQuickShaderEffect::ShaderType QQuickGenericShaderEffect::shaderType() const -{ - QSGGuiThreadShaderEffectManager *mgr = shaderEffectManager(); - if (!mgr) - return QQuickShaderEffect::ShaderType(0); - - return QQuickShaderEffect::ShaderType(mgr->shaderType()); -} - -QQuickShaderEffect::ShaderCompilationType QQuickGenericShaderEffect::shaderCompilationType() const -{ - QSGGuiThreadShaderEffectManager *mgr = shaderEffectManager(); - if (!mgr) - return QQuickShaderEffect::ShaderCompilationType(0); - - return QQuickShaderEffect::ShaderCompilationType(mgr->shaderCompilationType()); -} - -QQuickShaderEffect::ShaderSourceType QQuickGenericShaderEffect::shaderSourceType() const -{ - QSGGuiThreadShaderEffectManager *mgr = shaderEffectManager(); - if (!mgr) - return QQuickShaderEffect::ShaderSourceType(0); - - return QQuickShaderEffect::ShaderSourceType(mgr->shaderSourceType()); -} - void QQuickGenericShaderEffect::handleEvent(QEvent *event) { if (event->type() == QEvent::DynamicPropertyChange) { @@ -381,9 +354,6 @@ void QQuickGenericShaderEffect::backendChanged() disconnect(m_item->window(), SIGNAL(sceneGraphInitialized()), this, SLOT(backendChanged())); emit m_item->logChanged(); emit m_item->statusChanged(); - emit m_item->shaderTypeChanged(); - emit m_item->shaderCompilationTypeChanged(); - emit m_item->shaderSourceTypeChanged(); } void QQuickGenericShaderEffect::disconnectSignals(Shader shaderType) |