aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/instanced
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2016-11-18 11:39:15 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-18 17:17:46 +0000
commitb014cca49d684886ec9813d4b47d126bfa48cf4e (patch)
tree405c67fa421ffb6c1f40a523320484e83f51cd30 /src/gpu/instanced
parentce1d293880da7d37da984090ed40320e0e3a6ca7 (diff)
Make GrBufferAccess a nested class of GrProcessor
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4978 Change-Id: I08c24e9183108f4dd6068216488fd3ac9b5f3ec2 Reviewed-on: https://skia-review.googlesource.com/4978 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/instanced')
-rw-r--r--src/gpu/instanced/InstanceProcessor.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/instanced/InstanceProcessor.h b/src/gpu/instanced/InstanceProcessor.h
index 0b3a16d5a4..d54ffcd0c1 100644
--- a/src/gpu/instanced/InstanceProcessor.h
+++ b/src/gpu/instanced/InstanceProcessor.h
@@ -9,7 +9,6 @@
#define gr_instanced_InstanceProcessor_DEFINED
#include "GrCaps.h"
-#include "GrBufferAccess.h"
#include "GrGeometryProcessor.h"
#include "instanced/InstancedRenderingTypes.h"
@@ -57,8 +56,8 @@ private:
*/
static GrCaps::InstancedSupport CheckSupport(const GrGLSLCaps&, const GrCaps&);
- const BatchInfo fBatchInfo;
- GrBufferAccess fParamsAccess;
+ const BatchInfo fBatchInfo;
+ BufferAccess fParamsAccess;
friend class GLInstancedRendering; // For CheckSupport.