diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:54:40 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:54:40 +0000 |
| commit | 0e51577a14f903ffeafa117a75954baeb173ffb9 (patch) | |
| tree | 3f3d849f3b6ec7778660f0da19f5d4175ba9f800 /src/gpu/GrDrawTarget.cpp | |
| parent | af2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec (diff) | |
fix warning from scalar --> int32 conversion
BUG=
Review URL: https://codereview.appspot.com/7065050
git-svn-id: http://skia.googlecode.com/svn/trunk@7061 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrDrawTarget.cpp')
| -rw-r--r-- | src/gpu/GrDrawTarget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp index 976448d699..a67be1c550 100644 --- a/src/gpu/GrDrawTarget.cpp +++ b/src/gpu/GrDrawTarget.cpp @@ -93,6 +93,7 @@ const GrVertexLayout gTexCoordMasks[] = { }; GR_STATIC_ASSERT(GrDrawState::kMaxTexCoords == GR_ARRAY_COUNT(gTexCoordMasks)); +#ifdef SK_DEBUG bool check_layout(GrVertexLayout layout) { // can only have 1 or 0 bits set for each stage. for (int s = 0; s < GrDrawState::kNumStages; ++s) { @@ -103,6 +104,7 @@ bool check_layout(GrVertexLayout layout) { } return true; } +#endif int num_tex_coords(GrVertexLayout layout) { int cnt = 0; @@ -467,7 +469,7 @@ GrDrawTarget::GrDrawTarget() : fClip(NULL) { GrDrawTarget::~GrDrawTarget() { GrAssert(1 == fGeoSrcStateStack.count()); - GeometrySrcState& geoSrc = fGeoSrcStateStack.back(); + SkDEBUGCODE(GeometrySrcState& geoSrc = fGeoSrcStateStack.back()); GrAssert(kNone_GeometrySrcType == geoSrc.fIndexSrc); GrAssert(kNone_GeometrySrcType == geoSrc.fVertexSrc); fDrawState->unref(); |