rolling back to r3427
git-svn-id: http://skia.googlecode.com/svn/trunk@3430 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLCreateDebugInterface.cpp b/src/gpu/gl/GrGLCreateDebugInterface.cpp
index 7394f5b..3b2a376 100644
--- a/src/gpu/gl/GrGLCreateDebugInterface.cpp
+++ b/src/gpu/gl/GrGLCreateDebugInterface.cpp
@@ -100,17 +100,17 @@
GrAlwaysAssert(size >= 0);
// delete pre-existing data
- delete[] fDataPtr;
+ delete fDataPtr;
fSize = size;
- fDataPtr = new GrGLchar[size];
+ fDataPtr = new char[size];
if (dataPtr) {
memcpy(fDataPtr, dataPtr, fSize);
}
// TODO: w/ no dataPtr the data is unitialized - this could be tracked
}
GrGLint getSize() const { return fSize; }
- GrGLchar *getDataPtr() { return fDataPtr; }
+ GrGLvoid *getDataPtr() { return fDataPtr; }
GrGLint getUsage() const { return fUsage; }
void setUsage(GrGLint usage) { fUsage = usage; }
@@ -126,7 +126,7 @@
protected:
private:
- GrGLchar* fDataPtr;
+ GrGLvoid* 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 @@
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);