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/scenegraph/qsgadaptationlayer_p.h | |
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/scenegraph/qsgadaptationlayer_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgadaptationlayer_p.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 0df42c2aa8..8fdcf7af64 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -228,31 +228,12 @@ class Q_QUICK_PRIVATE_EXPORT QSGGuiThreadShaderEffectManager : public QObject Q_OBJECT public: - // Enum values must match ShaderEffect. - enum ShaderType { - UnknownShadingLanguage, - GLSL, - HLSL - }; - enum ShaderCompilationType { - RuntimeCompilation = 0x01, - OfflineCompilation = 0x02 - }; - enum ShaderSourceType { - ShaderSourceString = 0x01, - ShaderSourceFile = 0x02, - ShaderByteCode = 0x04 - }; enum Status { Compiled, Uncompiled, Error }; - virtual ShaderType shaderType() const = 0; - virtual int shaderCompilationType() const = 0; - virtual int shaderSourceType() const = 0; - virtual bool hasSeparateSamplerAndTextureObjects() const = 0; virtual QString log() const = 0; |