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

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

Issue 216503004: SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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 "gl/GrGLEffect.h" 9 #include "gl/GrGLEffect.h"
10 #include "gl/GrGLSL.h" 10 #include "gl/GrGLSL.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))], 66 kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
67 kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))], 67 kTileModes[random->nextULessThan(SK_ARRAY_COUNT(kTileModes))],
68 }; 68 };
69 GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBil erp_FilterMode : 69 GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBil erp_FilterMode :
70 GrTextureParams::kNon e_FilterMode); 70 GrTextureParams::kNon e_FilterMode);
71 71
72 static const GrCoordSet kCoordSets[] = { 72 static const GrCoordSet kCoordSets[] = {
73 kLocal_GrCoordSet, 73 kLocal_GrCoordSet,
74 kPosition_GrCoordSet 74 kPosition_GrCoordSet
75 }; 75 };
76 GrCoordSet coordSet = kCoordSets[random->nextULessThan(GR_ARRAY_COUNT(kCoord Sets))]; 76 GrCoordSet coordSet = kCoordSets[random->nextULessThan(SK_ARRAY_COUNT(kCoord Sets))];
77 77
78 const SkMatrix& matrix = GrEffectUnitTest::TestMatrix(random); 78 const SkMatrix& matrix = GrEffectUnitTest::TestMatrix(random);
79 return GrSimpleTextureEffect::Create(textures[texIdx], matrix, coordSet); 79 return GrSimpleTextureEffect::Create(textures[texIdx], matrix, coordSet);
80 } 80 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698