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

Side by Side Diff: src/gpu/effects/GrSimpleTextureEffect.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT 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/effects/GrSimpleTextureEffect.h ('k') | src/gpu/effects/GrTextureDomain.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 "GrSimpleTextureEffect.h" 8 #include "GrSimpleTextureEffect.h"
9 #include "GrInvariantOutput.h" 9 #include "GrInvariantOutput.h"
10 #include "GrTexture.h" 10 #include "GrTexture.h"
(...skipping 25 matching lines...) Expand all
36 void GrSimpleTextureEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c onst { 36 void GrSimpleTextureEffect::onComputeInvariantOutput(GrInvariantOutput* inout) c onst {
37 this->updateInvariantOutputForModulation(inout); 37 this->updateInvariantOutputForModulation(inout);
38 } 38 }
39 39
40 void GrSimpleTextureEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, 40 void GrSimpleTextureEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
41 GrProcessorKeyBuilder* b) const { 41 GrProcessorKeyBuilder* b) const {
42 GrGLSimpleTextureEffect::GenKey(*this, caps, b); 42 GrGLSimpleTextureEffect::GenKey(*this, caps, b);
43 } 43 }
44 44
45 GrGLFragmentProcessor* GrSimpleTextureEffect::onCreateGLInstance() const { 45 GrGLFragmentProcessor* GrSimpleTextureEffect::onCreateGLInstance() const {
46 return SkNEW_ARGS(GrGLSimpleTextureEffect, (*this)); 46 return new GrGLSimpleTextureEffect(*this);
47 } 47 }
48 48
49 /////////////////////////////////////////////////////////////////////////////// 49 ///////////////////////////////////////////////////////////////////////////////
50 50
51 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSimpleTextureEffect); 51 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSimpleTextureEffect);
52 52
53 GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(GrProcessorTestData* d) { 53 GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(GrProcessorTestData* d) {
54 int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx : 54 int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
55 GrProcessorUnitTest::kAlphaTextureIdx; 55 GrProcessorUnitTest::kAlphaTextureIdx;
56 static const SkShader::TileMode kTileModes[] = { 56 static const SkShader::TileMode kTileModes[] = {
(...skipping 11 matching lines...) Expand all
68 static const GrCoordSet kCoordSets[] = { 68 static const GrCoordSet kCoordSets[] = {
69 kLocal_GrCoordSet, 69 kLocal_GrCoordSet,
70 kDevice_GrCoordSet 70 kDevice_GrCoordSet
71 }; 71 };
72 GrCoordSet coordSet = kCoordSets[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kC oordSets))]; 72 GrCoordSet coordSet = kCoordSets[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kC oordSets))];
73 73
74 const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom); 74 const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
75 return GrSimpleTextureEffect::Create(d->fProcDataManager, d->fTextures[texId x], matrix, 75 return GrSimpleTextureEffect::Create(d->fProcDataManager, d->fTextures[texId x], matrix,
76 coordSet); 76 coordSet);
77 } 77 }
OLDNEW
« no previous file with comments | « src/gpu/effects/GrSimpleTextureEffect.h ('k') | src/gpu/effects/GrTextureDomain.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698