aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrDrawingManager.h
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2018-01-18 12:59:22 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-18 18:31:58 +0000
commit40a29d7705d970be03ff94f9fa062db75dccbd0f (patch)
tree67908df5424d112ea27a012de435819586f23793 /src/gpu/GrDrawingManager.h
parent3af7f6e2ce32c0909159145b23378d119e900bbe (diff)
Move GrOpFlushState out of GrDrawingManager and onto the stack
Change-Id: If1b3481af7637bfed8a73d75be41c6422319951f Reviewed-on: https://skia-review.googlesource.com/96540 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrDrawingManager.h')
-rw-r--r--src/gpu/GrDrawingManager.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h
index 0162b4bd74..e9e98af4a7 100644
--- a/src/gpu/GrDrawingManager.h
+++ b/src/gpu/GrDrawingManager.h
@@ -8,7 +8,6 @@
#ifndef GrDrawingManager_DEFINED
#define GrDrawingManager_DEFINED
-#include "GrOpFlushState.h"
#include "GrPathRenderer.h"
#include "GrPathRendererChain.h"
#include "GrRenderTargetOpList.h"
@@ -92,7 +91,6 @@ private:
, fAtlasTextContext(nullptr)
, fPathRendererChain(nullptr)
, fSoftwarePathRenderer(nullptr)
- , fFlushState(context->getGpu(), context->contextPriv().resourceProvider())
, fFlushing(false) {}
void abandon();
@@ -138,7 +136,7 @@ private:
GrPathRendererChain* fPathRendererChain;
GrSoftwarePathRenderer* fSoftwarePathRenderer;
- GrOpFlushState fFlushState;
+ GrTokenTracker fTokenTracker;
bool fFlushing;
SkTArray<GrOnFlushCallbackObject*> fOnFlushCBObjects;