Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Unified Diff: src/gpu/GrDrawTarget.cpp

Issue 2123693002: Revert of Begin instanced rendering for simple shapes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrDrawTarget.h ('k') | src/gpu/GrDrawingManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawTarget.cpp
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 94f7293ef93cbce3e7a9d1e8520e5a7612784874..7ddcf1cacb8ec2268d18d888108af0ac3cda470f 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -33,8 +33,6 @@
#include "batches/GrRectBatchFactory.h"
#include "batches/GrStencilPathBatch.h"
-#include "instanced/InstancedRendering.h"
-
////////////////////////////////////////////////////////////////////////////////
// Experimentally we have found that most batching occurs within the first 10 comparisons.
@@ -47,8 +45,7 @@
, fResourceProvider(resourceProvider)
, fAuditTrail(auditTrail)
, fFlags(0)
- , fRenderTarget(rt)
- , fInstancedRendering(fGpu->createInstancedRenderingIfSupported()) {
+ , fRenderTarget(rt) {
// TODO: Stop extracting the context (currently needed by GrClipMaskManager)
fContext = fGpu->getContext();
@@ -204,10 +201,6 @@
fBatches[i]->prepare(flushState);
}
}
-
- if (fInstancedRendering) {
- fInstancedRendering->beginFlush(flushState->resourceProvider());
- }
}
void GrDrawTarget::drawBatches(GrBatchFlushState* flushState) {
@@ -265,9 +258,6 @@
void GrDrawTarget::reset() {
fBatches.reset();
- if (fInstancedRendering) {
- fInstancedRendering->endFlush();
- }
}
void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder,
« no previous file with comments | « src/gpu/GrDrawTarget.h ('k') | src/gpu/GrDrawingManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698