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

Side by Side Diff: src/gpu/GrProcessor.cpp

Issue 1313573005: Revert of Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor* (Closed) Base URL: https://skia.googlesource.com/skia.git@things
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/SkGr.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrProcessor.h" 8 #include "GrProcessor.h"
9 #include "GrContext.h" 9 #include "GrContext.h"
10 #include "GrCoordTransform.h" 10 #include "GrCoordTransform.h"
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 } 234 }
235 int count = this->numTransforms(); 235 int count = this->numTransforms();
236 for (int i = 0; i < count; ++i) { 236 for (int i = 0; i < count; ++i) {
237 if (this->coordTransform(i) != that.coordTransform(i)) { 237 if (this->coordTransform(i) != that.coordTransform(i)) {
238 return false; 238 return false;
239 } 239 }
240 } 240 }
241 return true; 241 return true;
242 } 242 }
243 243
244 void GrFragmentProcessor::computeInvariantOutput(GrInvariantOutput* inout) const {
245 this->onComputeInvariantOutput(inout);
246 }
247
244 //////////////////////////////////////////////////////////////////////////////// /////////////////// 248 //////////////////////////////////////////////////////////////////////////////// ///////////////////
245 249
246 // Initial static variable from GrXPFactory 250 // Initial static variable from GrXPFactory
247 int32_t GrXPFactory::gCurrXPFClassID = 251 int32_t GrXPFactory::gCurrXPFClassID =
248 GrXPFactory::kIllegalXPFClassID; 252 GrXPFactory::kIllegalXPFClassID;
249 253
250 //////////////////////////////////////////////////////////////////////////////// /////////////////// 254 //////////////////////////////////////////////////////////////////////////////// ///////////////////
251 255
252 // GrProcessorDataManager lives in the same pool 256 // GrProcessorDataManager lives in the same pool
253 void* GrProcessorDataManager::operator new(size_t size) { 257 void* GrProcessorDataManager::operator new(size_t size) {
254 return MemoryPoolAccessor().pool()->allocate(size); 258 return MemoryPoolAccessor().pool()->allocate(size);
255 } 259 }
256 260
257 void GrProcessorDataManager::operator delete(void* target) { 261 void GrProcessorDataManager::operator delete(void* target) {
258 return MemoryPoolAccessor().pool()->release(target); 262 return MemoryPoolAccessor().pool()->release(target);
259 } 263 }
OLDNEW
« no previous file with comments | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/SkGr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698