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

Unified Diff: src/gpu/GrInOrderCommandBuilder.cpp

Issue 1285193004: Move willColorBlendWithDst from pipeline builder to GrPipelineOptimizations. (Closed) Base URL: https://skia.googlesource.com/skia.git@xpfail
Patch Set: Address comment Created 5 years, 4 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/GrInOrderCommandBuilder.h ('k') | src/gpu/GrPipeline.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrInOrderCommandBuilder.cpp
diff --git a/src/gpu/GrInOrderCommandBuilder.cpp b/src/gpu/GrInOrderCommandBuilder.cpp
index 0fc7effd9980cdeb25946f7027a158c1fea29005..390e1c65f96734342b6cc090a27034a092534efe 100644
--- a/src/gpu/GrInOrderCommandBuilder.cpp
+++ b/src/gpu/GrInOrderCommandBuilder.cpp
@@ -78,7 +78,7 @@ GrInOrderCommandBuilder::recordDrawPaths(State* state,
GrDrawTarget::PathTransformType transformType,
int count,
const GrStencilSettings& stencilSettings,
- const GrDrawTarget::PipelineInfo& pipelineInfo) {
+ const GrPipelineOptimizations& opts) {
SkASSERT(pathRange);
SkASSERT(indexValues);
SkASSERT(transformValues);
@@ -105,7 +105,7 @@ GrInOrderCommandBuilder::recordDrawPaths(State* state,
stencilSettings == previous->fStencilSettings &&
path_fill_type_is_winding(stencilSettings) &&
previous->fState == state &&
- !pipelineInfo.willColorBlendWithDst(pathProc)) {
+ !opts.willColorBlendWithDst()) {
const int indexBytes = GrPathRange::PathIndexSizeInBytes(indexType);
const int xformSize = GrPathRendering::PathTransformSize(transformType);
« no previous file with comments | « src/gpu/GrInOrderCommandBuilder.h ('k') | src/gpu/GrPipeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698