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

During ganesh tear-down, it may be the case that the vertex and index buffers

Browse Source 
are those currently bound to the HW geometry state.  We should not assert under
these conditions.

Review:  http://codereview.appspot.com/4365046/



git-svn-id: http://skia.googlecode.com/svn/trunk@1076 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
twiz@google.com 2011-04-07 15:57:12 +00:00
parent a7e2370e72
commit f236d16914
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpu/src/GrGpuGL.cpp
View File

@ -1739,9 +1739,6 @@ void GrGpuGL::notifyVertexBufferBind(const GrGLVertexBuffer* buffer) {
} }
void GrGpuGL::notifyVertexBufferDelete(const GrGLVertexBuffer* buffer) { void GrGpuGL::notifyVertexBufferDelete(const GrGLVertexBuffer* buffer) {
GrAssert(!(kBuffer_GeometrySrcType == fGeometrySrc.fVertexSrc &&
buffer == fGeometrySrc.fVertexBuffer));
if (fHWGeometryState.fVertexBuffer == buffer) { if (fHWGeometryState.fVertexBuffer == buffer) {
// deleting bound buffer does implied bind to 0 // deleting bound buffer does implied bind to 0
fHWGeometryState.fVertexBuffer = NULL; fHWGeometryState.fVertexBuffer = NULL;
@ -1754,9 +1751,6 @@ void GrGpuGL::notifyIndexBufferBind(const GrGLIndexBuffer* buffer) {
} }
void GrGpuGL::notifyIndexBufferDelete(const GrGLIndexBuffer* buffer) { void GrGpuGL::notifyIndexBufferDelete(const GrGLIndexBuffer* buffer) {
GrAssert(!(kBuffer_GeometrySrcType == fGeometrySrc.fIndexSrc &&
buffer == fGeometrySrc.fIndexBuffer));
if (fHWGeometryState.fIndexBuffer == buffer) { if (fHWGeometryState.fIndexBuffer == buffer) {
// deleting bound buffer does implied bind to 0 // deleting bound buffer does implied bind to 0
fHWGeometryState.fIndexBuffer = NULL; fHWGeometryState.fIndexBuffer = NULL;