commit ae6b777ba6d37b5330cdadc15ccff796fe172ca2
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 18:07:39 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jul 18 18:07:39 2013 +0000
tree 76c1ed3df03212c8a98297ac02cd7baf78e2e0e0
parent d6543e5edae5d2fe9f364a563f41c1654b14e5f4

Fix build breakages due to r10148



git-svn-id: http://skia.googlecode.com/svn/trunk@10149 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLCreateNullInterface.cpp

diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index 0fa2b9e..f011334 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -21,7 +21,7 @@
     }
     ~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 @@
 
     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 @@
 private:
     GrGLuint     fID;
     GrGLchar*    fDataPtr;
-    GrGLint      fSize;         // size in bytes
+    GrGLsizeiptr fSize;         // size in bytes
     bool         fMapped;
 };
 
@@ -73,7 +73,7 @@
         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));

src/gpu/gl/debug/GrBufferObj.cpp

diff --git a/src/gpu/gl/debug/GrBufferObj.cpp b/src/gpu/gl/debug/GrBufferObj.cpp
index 7d605eb..37d4438 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

src/gpu/gl/debug/GrBufferObj.h

diff --git a/src/gpu/gl/debug/GrBufferObj.h b/src/gpu/gl/debug/GrBufferObj.h
index faa2398..fecfeb5 100644
--- a/src/gpu/gl/debug/GrBufferObj.h
+++ b/src/gpu/gl/debug/GrBufferObj.h
@@ -42,8 +42,8 @@
     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 @@
 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;
 };