diff options
author | Jean-Michaƫl Celerier <jean-michael.celerier@kdab.com> | 2020-01-03 18:34:15 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2020-01-15 07:03:36 +0100 |
commit | 825230b872beb5dcfe1a1ce9019f8d80704a1553 (patch) | |
tree | c52c578f2f200d1516ac1c899b35dac9775532c9 /src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h | |
parent | 00d90969b270f4ebf9591904827de0fb17368b57 (diff) |
Start work on handling shaderswip/rhi-renderer
Change-Id: Id39cda016c4fa588cded896faaf2a976691a17f6
Diffstat (limited to 'src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h')
-rw-r--r-- | src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h index 89da47371..605899823 100644 --- a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h +++ b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2020 Klaralvdalens Datakonsult AB (KDAB). ** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: https://www.qt.io/licensing/ ** @@ -105,11 +105,8 @@ public: GraphicsContext(); ~GraphicsContext(); - void setOpenGLContext(QOpenGLContext* ctx); - //QOpenGLContext *openGLContext() { return m_gl; } bool makeCurrent(QSurface *surface); void doneCurrent(); - bool hasValidGLHelper() const; bool isInitialized() const; // Shaders @@ -188,21 +185,15 @@ public: static GLint glDataTypeFromAttributeDataType(QAttribute::VertexBaseType dataType); bool supportsDrawBuffersBlend() const; - bool supportsVAO() const { return m_supportsVAO; } void initialize(); void initializeHelpers(QSurface *surface); - GraphicsHelperInterface *resolveHighestOpenGLFunctions(); bool m_initialized; - bool m_supportsVAO; GLint m_maxTextureUnits; GLint m_maxImageUnits; GLuint m_defaultFBO; - //* QOpenGLContext *m_gl; - //* GraphicsHelperInterface *m_glHelper; - //* QHash<QSurface *, GraphicsHelperInterface*> m_glHelpers; GraphicsApiFilterData m_contextInfo; QScopedPointer<QOpenGLDebugLogger> m_debugLogger; |