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

rolling back to r3427

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@3430 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2012-03-19 17:33:58 +00:00
parent 63883bff32
commit d41a1dc7a8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,17 +100,17 @@ public:
GrAlwaysAssert(size >= 0); GrAlwaysAssert(size >= 0);
// delete pre-existing data // delete pre-existing data
delete[] fDataPtr; delete fDataPtr;
fSize = size; fSize = size;
fDataPtr = new GrGLchar[size]; fDataPtr = new char[size];
if (dataPtr) { if (dataPtr) {
memcpy(fDataPtr, dataPtr, fSize); memcpy(fDataPtr, dataPtr, fSize);
} }
// TODO: w/ no dataPtr the data is unitialized - this could be tracked // TODO: w/ no dataPtr the data is unitialized - this could be tracked
} }
GrGLint getSize() const { return fSize; } GrGLint getSize() const { return fSize; }
GrGLchar *getDataPtr() { return fDataPtr; } GrGLvoid *getDataPtr() { return fDataPtr; }
GrGLint getUsage() const { return fUsage; } GrGLint getUsage() const { return fUsage; }
void setUsage(GrGLint usage) { fUsage = usage; } void setUsage(GrGLint usage) { fUsage = usage; }
@ -126,7 +126,7 @@ public:
protected: protected:
private: private:
GrGLchar* fDataPtr; GrGLvoid* fDataPtr;
bool fMapped; // is the buffer object mapped via "glMapBuffer"? bool fMapped; // is the buffer object mapped via "glMapBuffer"?
bool fBound; // is the buffer object bound via "glBindBuffer"? bool fBound; // is the buffer object bound via "glBindBuffer"?
GrGLint fSize; // size in bytes GrGLint fSize; // size in bytes
@ -342,10 +342,10 @@ int GrDebugGL::fNextID = 0;
GrDebugGL GrDebugGL::Obj; 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()); // GrAlwaysAssert(texture < GrDebugGL::getInstance()->getMaxTextureUnits());
GrDebugGL::getInstance()->setCurTextureUnit(texture); GrDebugGL::getInstance()->setCurTextureUnit(texture);

2
whitespace.txt
View File

@ -1,5 +1,5 @@
You can modify this file to create no-op changelists. You can modify this file to create no-op changelists.