diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-19 22:00:40 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-19 22:00:40 +0000 |
| commit | 2cfa3200fda29279eba1240170c7e873d12f9d48 (patch) | |
| tree | 42c50379d08cfbbf9d2af7b316010feafe1b1f78 /src/gpu | |
| parent | 2dceedaa1e4dfb9accc82d8e3d3afac9ba5b2142 (diff) | |
fix warnings around size_t/int
fix warnings around undeclared (non-static) functions
TBR=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/242643008
git-svn-id: http://skia.googlecode.com/svn/trunk@14267 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrTHashTable.h | 5 | ||||
| -rw-r--r-- | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/GrTHashTable.h b/src/gpu/GrTHashTable.h index 83462c70c9..9307425b91 100644 --- a/src/gpu/GrTHashTable.h +++ b/src/gpu/GrTHashTable.h @@ -61,7 +61,10 @@ private: kHashCount = 1 << kHashBits, kHashMask = kHashCount - 1 }; - static unsigned hash2Index(uint32_t hash) { + static unsigned hash2Index(intptr_t hash) { + if (sizeof(hash) == 8) { + hash ^= hash >> 32; + } hash ^= hash >> 16; if (kHashBits <= 8) { hash ^= hash >> 8; diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp index 2751e02c18..cbfbb266c5 100644 --- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp +++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp @@ -712,7 +712,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE debugGLGetBufferParameteriv(GrGLenum target, case GR_GL_BUFFER_SIZE: *params = 0; if (buffer) - *params = buffer->getSize(); + *params = SkToInt(buffer->getSize()); break; case GR_GL_BUFFER_USAGE: *params = GR_GL_STATIC_DRAW; |