AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Addressed compiler warnings in the Debug GL Interface on Linux.

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



git-svn-id: http://skia.googlecode.com/svn/trunk@3428 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-03-19 16:19:02 +00:00
parent 57e080c1eb
commit 34c54e4423
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gpu/gl/GrGLCreateDebugInterface.cpp
View File

@ -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
@ -345,7 +345,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);