First triangle

Change-Id: I1db75f3840c2776acfb18c1907dc7d868e8bfba4

1 files changed, 14 insertions, 7 deletions

diff --git a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h
index 0583e3f11..89da47371 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h
+++ b/src/plugins/renderers/rhi/graphicshelpers/graphicscontext_p.h
@@ -80,6 +80,10 @@ class QOpenGLShaderProgram;
 class QAbstractOpenGLFunctions;
 class QOpenGLDebugLogger;
 
+class QRhi;
+class QRhiSwapChain;
+class QRhiResourceUpdateBatch;
+
 namespace Qt3DRender {
 
 namespace Render {
@@ -93,7 +97,6 @@ namespace Rhi {
 class GraphicsHelperInterface;
 class RHIShader;
 class RHIShaderManager;
-
 typedef QPair<QString, int> NamedUniformLocation;
 
 class Q_AUTOTEST_EXPORT GraphicsContext
@@ -103,7 +106,7 @@ public:
     ~GraphicsContext();
 
     void setOpenGLContext(QOpenGLContext* ctx);
-    QOpenGLContext *openGLContext() { return m_gl; }
+    //QOpenGLContext *openGLContext() { return m_gl; }
     bool makeCurrent(QSurface *surface);
     void doneCurrent();
     bool hasValidGLHelper() const;
@@ -196,16 +199,20 @@ public:
     GLint m_maxTextureUnits;
     GLint m_maxImageUnits;
     GLuint m_defaultFBO;
-    QOpenGLContext *m_gl;
-    GraphicsHelperInterface *m_glHelper;
+    //* QOpenGLContext *m_gl;
+    //* GraphicsHelperInterface *m_glHelper;
 
-    QHash<QSurface *, GraphicsHelperInterface*> m_glHelpers;
+    //* QHash<QSurface *, GraphicsHelperInterface*> m_glHelpers;
     GraphicsApiFilterData m_contextInfo;
     QScopedPointer<QOpenGLDebugLogger> m_debugLogger;
 
     friend class RHIVertexArrayObject;
     RHIVertexArrayObject *m_currentVAO;
 
+    QRhi* m_rhi{};
+    QRhiSwapChain* m_sc{};
+    QRhiResourceUpdateBatch *m_currentUpdates{};
+
     void applyUniform(const ShaderUniform &description, const UniformValue &v);
 
     template<UniformType>
@@ -223,8 +230,8 @@ void GraphicsContext::applyUniformHelper<UniformTypeEnum>(const ShaderUniform &d
     template<> \
     void GraphicsContext::applyUniformHelper<UniformTypeEnum>(const ShaderUniform &description, const UniformValue &value) const \
 { \
-    const int count = qMin(description.m_size, int(value.byteSize() / description.m_rawByteSize)); \
-    m_glHelper->Func(description.m_location, count, value.constData<BaseType>()); \
+    /*/ const int count = qMin(description.m_size, int(value.byteSize() / description.m_rawByteSize)); \
+    m_glHelper->Func(description.m_location, count, value.constData<BaseType>()); */ \
 }