diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-22 20:26:44 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-22 20:26:44 +0000 |
| commit | 5d7ca957edcc57f7f0be2741183e8d3c36cb5129 (patch) | |
| tree | 0411b94219a31ef184fb78d303049997fa879482 /src/gpu/gl | |
| parent | ea774d2a5a049bf89474c0f047ed6a4e521de126 (diff) | |
Fix gyp files to allow ninja to build 64 bit on Mac.
Fix warnings that cropped up building as 64-bit.
BUG=
R=bsalomon@google.com, bungeman@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/13852013
git-svn-id: http://skia.googlecode.com/svn/trunk@8814 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLSL.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLSL.h b/src/gpu/gl/GrGLSL.h index 869b0e180c..883cc9b41a 100644 --- a/src/gpu/gl/GrGLSL.h +++ b/src/gpu/gl/GrGLSL.h @@ -54,7 +54,7 @@ static inline int GrSLTypeToVecLength(GrSLType type) { 1, // kMat44f_GrSLType 1, // kSampler2D_GrSLType }; - GrAssert((size_t) type < GR_ARRAY_COUNT(kVecLengths)); + GR_STATIC_ASSERT(kGrSLTypeCount == GR_ARRAY_COUNT(kVecLengths)); return kVecLengths[type]; } diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 3f5ab03303..0f3d534331 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1966,7 +1966,7 @@ inline GrGLenum tile_to_gl_wrap(SkShader::TileMode tm) { GR_GL_REPEAT, GR_GL_MIRRORED_REPEAT }; - GrAssert((unsigned) tm <= SK_ARRAY_COUNT(gWrapModes)); + GR_STATIC_ASSERT(SkShader::kTileModeCount == SK_ARRAY_COUNT(gWrapModes)); GR_STATIC_ASSERT(0 == SkShader::kClamp_TileMode); GR_STATIC_ASSERT(1 == SkShader::kRepeat_TileMode); GR_STATIC_ASSERT(2 == SkShader::kMirror_TileMode); |