| Index: src/gpu/gl/debug/GrDebugGL.cpp
|
| ===================================================================
|
| --- src/gpu/gl/debug/GrDebugGL.cpp (revision 7907)
|
| +++ src/gpu/gl/debug/GrDebugGL.cpp (working copy)
|
| @@ -14,8 +14,8 @@
|
| #include "GrShaderObj.h"
|
| #include "GrProgramObj.h"
|
| #include "GrTextureUnitObj.h"
|
| +#include "GrVertexArrayObj.h"
|
|
|
| -
|
| GrDebugGL* GrDebugGL::gObj = NULL;
|
| int GrDebugGL::gStaticRefCount = 0;
|
| GrDebugGL::Create GrDebugGL::gFactoryFunc[kObjTypeCount] = {
|
| @@ -26,6 +26,7 @@
|
| GrShaderObj::createGrShaderObj,
|
| GrProgramObj::createGrProgramObj,
|
| GrTextureUnitObj::createGrTextureUnitObj,
|
| + GrVertexArrayObj::createGrVertexArrayObj,
|
| };
|
|
|
|
|
| @@ -38,7 +39,8 @@
|
| , fFrameBuffer(NULL)
|
| , fRenderBuffer(NULL)
|
| , fProgram(NULL)
|
| - , fTexture(NULL) {
|
| + , fTexture(NULL)
|
| + , fVertexArray(NULL) {
|
|
|
| for (int i = 0; i < kDefaultMaxTextureUnits; ++i) {
|
|
|
| @@ -70,6 +72,7 @@
|
| fRenderBuffer = NULL;
|
| fProgram = NULL;
|
| fTexture = NULL;
|
| + fVertexArray = NULL;
|
| }
|
|
|
| GrFakeRefObj *GrDebugGL::findObject(GrGLuint ID, GrObjTypes type) {
|
| @@ -107,6 +110,13 @@
|
| }
|
| }
|
|
|
| +void GrDebugGL::setVertexArray(GrVertexArrayObj* vertexArray) {
|
| + if (NULL != vertexArray) {
|
| + GrAssert(!vertexArray->getDeleted());
|
| + }
|
| + SkRefCnt_SafeAssign(fVertexArray, vertexArray);
|
| +}
|
| +
|
| void GrDebugGL::setElementArrayBuffer(GrBufferObj *elementArrayBuffer) {
|
| if (fElementArrayBuffer) {
|
| // automatically break the binding of the old buffer
|
|
|