| Index: src/gpu/gl/GrGpuGL.cpp
|
| ===================================================================
|
| --- src/gpu/gl/GrGpuGL.cpp (revision 11815)
|
| +++ src/gpu/gl/GrGpuGL.cpp (working copy)
|
| @@ -1167,7 +1167,7 @@
|
| // make sure driver can allocate memory for this buffer
|
| GL_ALLOC_CALL(this->glInterface(),
|
| BufferData(GR_GL_ARRAY_BUFFER,
|
| - desc.fSizeInBytes,
|
| + (GrGLsizeiptr) desc.fSizeInBytes,
|
| NULL, // data ptr
|
| desc.fDynamic ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW));
|
| if (CHECK_ALLOC_ERROR(this->glInterface()) != GR_GL_NO_ERROR) {
|
| @@ -1200,7 +1200,7 @@
|
| // make sure driver can allocate memory for this buffer
|
| GL_ALLOC_CALL(this->glInterface(),
|
| BufferData(GR_GL_ELEMENT_ARRAY_BUFFER,
|
| - desc.fSizeInBytes,
|
| + (GrGLsizeiptr) desc.fSizeInBytes,
|
| NULL, // data ptr
|
| desc.fDynamic ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW));
|
| if (CHECK_ALLOC_ERROR(this->glInterface()) != GR_GL_NO_ERROR) {
|
| @@ -1448,7 +1448,8 @@
|
| if (rowBytes != tightRowBytes) {
|
| if (this->glCaps().packRowLengthSupport()) {
|
| SkASSERT(!(rowBytes % sizeof(GrColor)));
|
| - GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, rowBytes / sizeof(GrColor)));
|
| + GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH,
|
| + static_cast<GrGLint>(rowBytes / sizeof(GrColor))));
|
| readDstRowBytes = rowBytes;
|
| } else {
|
| scratch.reset(tightRowBytes * height);
|
|
|