From: robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Mon, 19 Mar 2012 16:19:02 +0000 (+0000)
Subject: Addressed compiler warnings in the Debug GL Interface on Linux.
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~16619
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34c54e44233faf6d4f1d931e854413388556d596;p=platform%2Fupstream%2FlibSkiaSharp.git

Addressed compiler warnings in the Debug GL Interface on Linux.

http://codereview.appspot.com/5845068/



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

diff --git a/src/gpu/gl/GrGLCreateDebugInterface.cpp b/src/gpu/gl/GrGLCreateDebugInterface.cpp
index 3b2a376..7394f5b 100644
--- a/src/gpu/gl/GrGLCreateDebugInterface.cpp
+++ b/src/gpu/gl/GrGLCreateDebugInterface.cpp
@@ -100,17 +100,17 @@ public:
         GrAlwaysAssert(size >= 0);
 
         // delete pre-existing data
-        delete fDataPtr;
+        delete[] fDataPtr;
 
         fSize = size;
-        fDataPtr = new char[size];
+        fDataPtr = new GrGLchar[size];
         if (dataPtr) {
             memcpy(fDataPtr, dataPtr, fSize);
         }
         // TODO: w/ no dataPtr the data is unitialized - this could be tracked
     }
     GrGLint getSize() const { return fSize; }
-    GrGLvoid *getDataPtr()  { return fDataPtr; }
+    GrGLchar *getDataPtr()  { return fDataPtr; }
 
     GrGLint getUsage() const { return fUsage; }
     void setUsage(GrGLint usage) { fUsage = usage; }
@@ -126,7 +126,7 @@ public:
 protected:
 private:
 
-    GrGLvoid*   fDataPtr;
+    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
@@ -342,10 +342,10 @@ int GrDebugGL::fNextID = 0;
 GrDebugGL GrDebugGL::Obj;
 
 ////////////////////////////////////////////////////////////////////////////////
-GrGLvoid GR_GL_FUNCTION_TYPE debugGLActiveTexture(GrGLenum texture) 
+GrGLvoid GR_GL_FUNCTION_TYPE debugGLActiveTexture(GrGLenum texture)
 {
-    
-    GrAlwaysAssert(0 <= texture);
+
+//    GrAlwaysAssert(0 <= texture);
 //    GrAlwaysAssert(texture < GrDebugGL::getInstance()->getMaxTextureUnits());
 
     GrDebugGL::getInstance()->setCurTextureUnit(texture);