diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2018-03-02 10:27:07 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2018-03-16 11:21:02 +0000 |
commit | c1b495f70c3b4f0c23d44dfcd99aed5882312100 (patch) | |
tree | ced8484d36d999395f520f2d7262d832afc73c99 /src/render/renderstates | |
parent | 02dff327fae71d6efdda091f8ae0a4483e72e849 (diff) |
Split GraphicsContext in two
- GraphicsContext is now a stateless wrapper around GL calls
- SubmissionContext is a GraphicsContext + caches and states used to render a
frame
Change-Id: I147b56dfd4c403911faadc0e9821fff9a892f71c
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/renderstates')
-rw-r--r-- | src/render/renderstates/renderstates.cpp | 1 | ||||
-rw-r--r-- | src/render/renderstates/renderstateset.cpp | 6 | ||||
-rw-r--r-- | src/render/renderstates/renderstateset_p.h | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/render/renderstates/renderstates.cpp b/src/render/renderstates/renderstates.cpp index d5e12aeab..4a2ec69b0 100644 --- a/src/render/renderstates/renderstates.cpp +++ b/src/render/renderstates/renderstates.cpp @@ -317,7 +317,6 @@ void LineWidth::apply(GraphicsContext *gc) const else gc->openGLContext()->functions()->glDisable(GL_LINE_SMOOTH); - gc->activateGLHelper(); gc->openGLContext()->functions()->glLineWidth(std::get<0>(m_values)); } diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderstates/renderstateset.cpp index 4166d41b0..bf84b0e1c 100644 --- a/src/render/renderstates/renderstateset.cpp +++ b/src/render/renderstates/renderstateset.cpp @@ -45,7 +45,7 @@ #include <QDebug> #include <QOpenGLContext> -#include <Qt3DRender/private/graphicscontext_p.h> +#include <Qt3DRender/private/submissioncontext_p.h> #include <Qt3DRender/private/renderstates_p.h> #include <Qt3DRender/private/qrenderstate_p.h> @@ -139,7 +139,7 @@ int RenderStateSet::changeCost(RenderStateSet *previousState) return cost; } -void RenderStateSet::apply(GraphicsContext *gc) +void RenderStateSet::apply(SubmissionContext *gc) { RenderStateSet* previousStates = gc->currentStateSet(); @@ -176,7 +176,7 @@ void RenderStateSet::merge(RenderStateSet *other) m_stateMask |= other->stateMask(); } -void RenderStateSet::resetMasked(StateMaskSet maskOfStatesToReset, GraphicsContext *gc) +void RenderStateSet::resetMasked(StateMaskSet maskOfStatesToReset, SubmissionContext *gc) { // TO DO -> Call gcHelper methods instead of raw GL // QOpenGLFunctions shouldn't be used here directly diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h index 307e0ff1d..58d46c7a6 100644 --- a/src/render/renderstates/renderstateset_p.h +++ b/src/render/renderstates/renderstateset_p.h @@ -65,7 +65,7 @@ class QRenderState; namespace Render { -class GraphicsContext; +class SubmissionContext; class RenderState; class RenderStateSet @@ -89,11 +89,11 @@ public: */ int changeCost(RenderStateSet* previousState); - void apply(GraphicsContext* gc); + void apply(SubmissionContext *gc); StateMaskSet stateMask() const; void merge(RenderStateSet *other); - void resetMasked(StateMaskSet maskOfStatesToReset, GraphicsContext* gc); + void resetMasked(StateMaskSet maskOfStatesToReset, SubmissionContext* gc); template<class State, typename ... Args> static StateVariant createState(Args... values) |