diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 15:56:14 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 15:56:14 +0000 |
| commit | 8c99c9f4a6fa14a4ade0fb39ff431f43a7306fc7 (patch) | |
| tree | 536610a55d61054d4b3478454779747b7d8a436c /src/gpu/gl | |
| parent | 80051d38a3469adb67fa7f503cf43fc2960c28b7 (diff) | |
Reverting r12315 (More Windows 64b compilation warning fixes) due to compilation failures
git-svn-id: http://skia.googlecode.com/svn/trunk@12316 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 e655210a45..d95874252e 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>() = SkToU32(newKeyLength); + *desc->atOffset<uint32_t, kLengthOffset>() = 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 a777e8f3ba..4f9adb727d 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 = static_cast<GrGLsizei>(this->getDrawState().getVertexSize()); + GrGLsizei stride = this->getDrawState().getVertexSize(); size_t vertexOffsetInBytes = stride * info.startVertex(); |