diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-06 12:09:01 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-06 12:09:01 +0000 |
| commit | cf6285b89b8820641ffb6871d4b3275bfe783f51 (patch) | |
| tree | 6494e0064186c8b01651c45c02f0c64efa6bfc3f /include | |
| parent | 2a2cc2057347553f07d933b021876ba5502e55cd (diff) | |
fix warnings on Mac in src/gpu and include/gpu
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6296044
git-svn-id: http://skia.googlecode.com/svn/trunk@4180 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrProgramStageFactory.h | 2 | ||||
| -rw-r--r-- | include/gpu/SkGr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/gpu/GrProgramStageFactory.h b/include/gpu/GrProgramStageFactory.h index 0fac7dbc07..c01b3f08a0 100644 --- a/include/gpu/GrProgramStageFactory.h +++ b/include/gpu/GrProgramStageFactory.h @@ -84,7 +84,7 @@ public: StageKey stageID = GLProgramStage::GenKey(stage); #if GR_DEBUG static const StageKey kIllegalIDMask = - ~((1 << kProgramStageKeyBits) - 1); + (uint16_t) (~((1U << kProgramStageKeyBits) - 1)); GrAssert(!(kIllegalIDMask & stageID)); #endif return fStageClassID | stageID; diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index 9e6d83e03f..8780104f10 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -152,7 +152,7 @@ private: //////////////////////////////////////////////////////////////////////////////// // Helper functions -static const GrTexture::TextureKey gUNCACHED_KEY = ~0; +static const GrTexture::TextureKey gUNCACHED_KEY = ~0U; GrContext::TextureCacheEntry sk_gr_create_bitmap_texture(GrContext* ctx, GrTexture::TextureKey key, const GrSamplerState* sampler, |