diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-21 19:46:50 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-21 19:46:50 +0000 |
| commit | 6970557055acaed619d7bb89451868e1570249b2 (patch) | |
| tree | 791272428a3135e2788e9a77915a3de581a99513 /src/gpu/gl | |
| parent | f6f123d23608a4a5fe9c812d2452039a18da7e0b (diff) | |
Re-attempting Linux debug GL interface compiler complaint fix.
Fixed two additional compiler complaints.
http://codereview.appspot.com/5845068/
git-svn-id: http://skia.googlecode.com/svn/trunk@3456 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLCreateDebugInterface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLCreateDebugInterface.cpp b/src/gpu/gl/GrGLCreateDebugInterface.cpp index b6e2e58ebf..de73fa25fb 100644 --- a/src/gpu/gl/GrGLCreateDebugInterface.cpp +++ b/src/gpu/gl/GrGLCreateDebugInterface.cpp @@ -122,7 +122,7 @@ public: GrAlwaysAssert(size >= 0); // delete pre-existing data - delete fDataPtr; + delete[] fDataPtr; fSize = size; fDataPtr = new GrGLchar[size]; @@ -132,7 +132,7 @@ public: // 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; } @@ -494,7 +494,7 @@ GrDebugGL GrDebugGL::Obj; //////////////////////////////////////////////////////////////////////////////// GrGLvoid GR_GL_FUNCTION_TYPE debugGLActiveTexture(GrGLenum texture) { - GrAlwaysAssert(0 <= texture); +// GrAlwaysAssert(0 <= texture); // GrAlwaysAssert(texture < GrDebugGL::getInstance()->getMaxTextureUnits()); GrDebugGL::getInstance()->setCurTextureUnit(texture); |