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

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

Issue 1213623022: fix up test create functions (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: more cleanup Created 5 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 unified diff | Download patch
« no previous file with comments | « src/gpu/effects/GrRRectEffect.cpp ('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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 49
50 GrGLFragmentProcessor* GrSimpleTextureEffect::createGLInstance() const { 50 GrGLFragmentProcessor* GrSimpleTextureEffect::createGLInstance() const {
51 return SkNEW_ARGS(GrGLSimpleTextureEffect, (*this)); 51 return SkNEW_ARGS(GrGLSimpleTextureEffect, (*this));
52 } 52 }
53 53
54 /////////////////////////////////////////////////////////////////////////////// 54 ///////////////////////////////////////////////////////////////////////////////
55 55
56 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSimpleTextureEffect); 56 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSimpleTextureEffect);
57 57
58 GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(SkRandom* random, 58 GrFragmentProcessor* GrSimpleTextureEffect::TestCreate(GrProcessorTestData* d) {
59 GrContext*, 59 int texIdx = d->fRandom->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
60 const GrCaps&, 60 GrProcessorUnitTest::kAlphaTextureIdx;
61 GrTexture* textures[]) {
62 int texIdx = random->nextBool() ? GrProcessorUnitTest::kSkiaPMTextureIdx :
63 GrProcessorUnitTest::kAlphaTextureIdx;
64 static const SkShader::TileMode kTileModes[] = { 61 static const SkShader::TileMode kTileModes[] = {
65 SkShader::kClamp_TileMode, 62 SkShader::kClamp_TileMode,
66 SkShader::kRepeat_TileMode, 63 SkShader::kRepeat_TileMode,
67 SkShader::kMirror_TileMode, 64 SkShader::kMirror_TileMode,
68 }; 65 };
69 SkShader::TileMode tileModes[] = { 66 SkShader::TileMode tileModes[] = {
70 kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))], 67 kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
71 kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))], 68 kTileModes[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
72 }; 69 };
73 GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBil erp_FilterMode : 70 GrTextureParams params(tileModes, d->fRandom->nextBool() ? GrTextureParams:: kBilerp_FilterMode :
74 GrTextureParams::kNon e_FilterMode); 71 GrTextureParams:: kNone_FilterMode);
75 72
76 static const GrCoordSet kCoordSets[] = { 73 static const GrCoordSet kCoordSets[] = {
77 kLocal_GrCoordSet, 74 kLocal_GrCoordSet,
78 kDevice_GrCoordSet 75 kDevice_GrCoordSet
79 }; 76 };
80 GrCoordSet coordSet = kCoordSets[random->nextULessThan(SK_ARRAY_COUNT(kCoord Sets))]; 77 GrCoordSet coordSet = kCoordSets[d->fRandom->nextULessThan(SK_ARRAY_COUNT(kC oordSets))];
81 78
82 const SkMatrix& matrix = GrTest::TestMatrix(random); 79 const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
83 return GrSimpleTextureEffect::Create(textures[texIdx], matrix, coordSet); 80 return GrSimpleTextureEffect::Create(d->fTextures[texIdx], matrix, coordSet) ;
84 } 81 }
OLDNEW
« no previous file with comments | « src/gpu/effects/GrRRectEffect.cpp ('k') | src/gpu/effects/GrTextureDomain.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698