diff options
| -rw-r--r-- | src/gpu/effects/GrTextureStripAtlas.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp index c67a112811..f726b25cf9 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -229,7 +229,8 @@ void GrTextureStripAtlas::initLRU() { fRows[i].fPrev = NULL; this->appendLRU(fRows + i); } - GrAssert(NULL == fLRUFront->fPrev && NULL == fLRUBack->fNext); + GrAssert(NULL == fLRUFront || NULL == fLRUFront->fPrev); + GrAssert(NULL == fLRUBack || NULL == fLRUBack->fNext); } void GrTextureStripAtlas::appendLRU(AtlasRow* row) { diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index cf4acd5f0c..d03ef781e1 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -2236,7 +2236,8 @@ GrGLAttribArrayState* GrGpuGL::HWGeometryState::bindArrayAndBuffersToDraw( const GrGLVertexBuffer* vbuffer, const GrGLIndexBuffer* ibuffer) { GrAssert(NULL != vbuffer); - GrGLAttribArrayState* attribState = &fDefaultVertexArrayAttribState; + GrGLAttribArrayState* attribState; + // We use a vertex array if we're on a core profile and the verts are in a VBO. if (gpu->glCaps().isCoreProfile() && !vbuffer->isCPUBacked()) { if (NULL == fVBOVertexArray || !fVBOVertexArray->isValid()) { |