diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-21 14:24:16 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-21 14:24:16 +0000 |
| commit | a4662865e37a2ca95b5e3379072f6a274acc8ac8 (patch) | |
| tree | dd09a0539c780850e5897df268dfca073e9f2d32 /src/gpu/gl | |
| parent | bcd431e1778001990c4d877929b14959dc96a0d3 (diff) | |
More Windows 64b compilation warning fixes
https://codereview.chromium.org/47513017/
git-svn-id: http://skia.googlecode.com/svn/trunk@12337 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLProgramDesc.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL_program.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp index d95874252e..e655210a45 100644 --- a/src/gpu/gl/GrGLProgramDesc.cpp +++ b/src/gpu/gl/GrGLProgramDesc.cpp @@ -105,7 +105,7 @@ void GrGLProgramDesc::Build(const GrDrawState& drawState, memset(desc->header(), 0, kHeaderSize); } // write the key length - *desc->atOffset<uint32_t, kLengthOffset>() = newKeyLength; + *desc->atOffset<uint32_t, kLengthOffset>() = SkToU32(newKeyLength); KeyHeader* header = desc->header(); EffectKey* effectKeys = desc->effectKeys(); diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index 4f9adb727d..a777e8f3ba 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -291,7 +291,7 @@ bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstC void GrGpuGL::setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes) { - GrGLsizei stride = this->getDrawState().getVertexSize(); + GrGLsizei stride = static_cast<GrGLsizei>(this->getDrawState().getVertexSize()); size_t vertexOffsetInBytes = stride * info.startVertex(); |