diff options
| -rw-r--r-- | src/gpu/gl/GrGLCreateNullInterface.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/gl/debug/GrBufferObj.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/debug/GrBufferObj.h | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp index 0fa2b9eb6a..f01133453a 100644 --- a/src/gpu/gl/GrGLCreateNullInterface.cpp +++ b/src/gpu/gl/GrGLCreateNullInterface.cpp @@ -21,7 +21,7 @@ public: } ~GrBufferObj() { SkDELETE_ARRAY(fDataPtr); } - void allocate(GrGLint size, const GrGLchar* dataPtr) { + void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) { if (NULL != fDataPtr) { GrAssert(0 != fSize); SkDELETE_ARRAY(fDataPtr); @@ -33,7 +33,7 @@ public: GrGLuint id() const { return fID; } GrGLchar* dataPtr() { return fDataPtr; } - GrGLint size() const { return fSize; } + GrGLsizeiptr size() const { return fSize; } void setMapped(bool mapped) { fMapped = mapped; } bool mapped() const { return fMapped; } @@ -41,7 +41,7 @@ public: private: GrGLuint fID; GrGLchar* fDataPtr; - GrGLint fSize; // size in bytes + GrGLsizeiptr fSize; // size in bytes bool fMapped; }; @@ -73,7 +73,7 @@ static GrBufferObj* create_buffer() { gBuffers.append(1, &buffer); } else { // recycle a slot from the free list - id = (GrGLuint) gBuffers[0]; + id = SkTCast<GrGLuint>(gBuffers[0]); gBuffers[0] = gBuffers[id]; buffer = SkNEW_ARGS(GrBufferObj, (id)); diff --git a/src/gpu/gl/debug/GrBufferObj.cpp b/src/gpu/gl/debug/GrBufferObj.cpp index 7d605ebef1..37d4438ef6 100644 --- a/src/gpu/gl/debug/GrBufferObj.cpp +++ b/src/gpu/gl/debug/GrBufferObj.cpp @@ -8,7 +8,7 @@ #include "GrBufferObj.h" -void GrBufferObj::allocate(GrGLint size, const GrGLchar *dataPtr) { +void GrBufferObj::allocate(GrGLsizeiptr size, const GrGLchar *dataPtr) { GrAlwaysAssert(size >= 0); // delete pre-existing data diff --git a/src/gpu/gl/debug/GrBufferObj.h b/src/gpu/gl/debug/GrBufferObj.h index faa23985c5..fecfeb5e3c 100644 --- a/src/gpu/gl/debug/GrBufferObj.h +++ b/src/gpu/gl/debug/GrBufferObj.h @@ -42,8 +42,8 @@ public: void resetBound() { fBound = false; } bool getBound() const { return fBound; } - void allocate(GrGLint size, const GrGLchar *dataPtr); - GrGLint getSize() const { return fSize; } + void allocate(GrGLsizeiptr size, const GrGLchar *dataPtr); + GrGLsizeiptr getSize() const { return fSize; } GrGLchar *getDataPtr() { return fDataPtr; } void setUsage(GrGLint usage) { fUsage = usage; } @@ -54,13 +54,13 @@ public: protected: private: - GrGLchar* fDataPtr; - bool fMapped; // is the buffer object mapped via "glMapBuffer"? - bool fBound; // is the buffer object bound via "glBindBuffer"? - GrGLint fSize; // size in bytes - GrGLint fUsage; // one of: GL_STREAM_DRAW, - // GL_STATIC_DRAW, - // GL_DYNAMIC_DRAW + GrGLchar* fDataPtr; + bool fMapped; // is the buffer object mapped via "glMapBuffer"? + bool fBound; // is the buffer object bound via "glBindBuffer"? + GrGLsizeiptr fSize; // size in bytes + GrGLint fUsage; // one of: GL_STREAM_DRAW, + // GL_STATIC_DRAW, + // GL_DYNAMIC_DRAW typedef GrFakeRefObj INHERITED; }; |