diff options
author | 2012-03-02 20:36:18 +0000 | |
---|---|---|
committer | 2012-03-02 20:36:18 +0000 | |
commit | c1dd88852a37de9f8d1d3ed75593614e41d51b46 (patch) | |
tree | eb64d4e65c022bed576257e3014827caef847963 /src/gpu | |
parent | 80898bb77d9f0f508bc147f31d6202ba4e35658c (diff) |
Better workaround for osx / nv bug
Review URL: http://codereview.appspot.com/5727044/
git-svn-id: http://skia.googlecode.com/svn/trunk@3308 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/gl/GrGLIndexBuffer.cpp | 50 | ||||
-rw-r--r-- | src/gpu/gl/GrGLVertexBuffer.cpp | 50 |
2 files changed, 52 insertions, 48 deletions
diff --git a/src/gpu/gl/GrGLIndexBuffer.cpp b/src/gpu/gl/GrGLIndexBuffer.cpp index f424e78cef..60bd9a9e3c 100644 --- a/src/gpu/gl/GrGLIndexBuffer.cpp +++ b/src/gpu/gl/GrGLIndexBuffer.cpp @@ -105,37 +105,29 @@ bool GrGLIndexBuffer::updateData(const void* src, size_t srcSizeInBytes) { this->bind(); GrGLenum usage = dynamic() ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW; - bool doNullHint = GR_GL_USE_BUFFER_DATA_NULL_HINT; -#if GR_GL_MAC_BUFFER_OBJECT_PERFOMANCE_WORKAROUND - GrAssert(!doNullHint); - static int N = 0; - doNullHint = (0 == N % 1024); - ++N; -#endif - - if (doNullHint) { - if (this->sizeInBytes() == srcSizeInBytes) { - GL_CALL(BufferData(GR_GL_ELEMENT_ARRAY_BUFFER, - srcSizeInBytes, src, usage)); - } else { - // Before we call glBufferSubData we give the driver a hint using - // glBufferData with NULL. This makes the old buffer contents - // inaccessible to future draws. The GPU may still be processing - // draws that reference the old contents. With this hint it can - // assign a different allocation for the new contents to avoid - // flushing the gpu past draws consuming the old contents. - GL_CALL(BufferData(GR_GL_ELEMENT_ARRAY_BUFFER, - this->sizeInBytes(), NULL, usage)); - GL_CALL(BufferSubData(GR_GL_ELEMENT_ARRAY_BUFFER, - 0, srcSizeInBytes, src)); - } +#if GR_GL_USE_BUFFER_DATA_NULL_HINT + if (this->sizeInBytes() == srcSizeInBytes) { + GL_CALL(BufferData(GR_GL_ELEMENT_ARRAY_BUFFER, + srcSizeInBytes, src, usage)); } else { - // Note that we're cheating on the size here. Currently no methods - // allow a partial update that preserves contents of non-updated - // portions of the buffer (lock() does a glBufferData(..size, NULL..)) - GL_CALL(BufferData(GR_GL_ELEMENT_ARRAY_BUFFER, - srcSizeInBytes, src, usage)); + // Before we call glBufferSubData we give the driver a hint using + // glBufferData with NULL. This makes the old buffer contents + // inaccessible to future draws. The GPU may still be processing + // draws that reference the old contents. With this hint it can + // assign a different allocation for the new contents to avoid + // flushing the gpu past draws consuming the old contents. + GL_CALL(BufferData(GR_GL_ELEMENT_ARRAY_BUFFER, + this->sizeInBytes(), NULL, usage)); + GL_CALL(BufferSubData(GR_GL_ELEMENT_ARRAY_BUFFER, + 0, srcSizeInBytes, src)); } +#else + // Note that we're cheating on the size here. Currently no methods + // allow a partial update that preserves contents of non-updated + // portions of the buffer (lock() does a glBufferData(..size, NULL..)) + GL_CALL(BufferData(GR_GL_ELEMENT_ARRAY_BUFFER, + srcSizeInBytes, src, usage)); +#endif return true; } diff --git a/src/gpu/gl/GrGLVertexBuffer.cpp b/src/gpu/gl/GrGLVertexBuffer.cpp index 4928868539..126a95f035 100644 --- a/src/gpu/gl/GrGLVertexBuffer.cpp +++ b/src/gpu/gl/GrGLVertexBuffer.cpp @@ -103,32 +103,44 @@ bool GrGLVertexBuffer::updateData(const void* src, size_t srcSizeInBytes) { GrGLenum usage = dynamic() ? GR_GL_DYNAMIC_DRAW : GR_GL_STATIC_DRAW; bool doNullHint = GR_GL_USE_BUFFER_DATA_NULL_HINT; +#if GR_GL_USE_BUFFER_DATA_NULL_HINT + if (this->sizeInBytes() == srcSizeInBytes) { + GL_CALL(BufferData(GR_GL_ARRAY_BUFFER, srcSizeInBytes, src, usage)); + } else { + // Before we call glBufferSubData we give the driver a hint using + // glBufferData with NULL. This makes the old buffer contents + // inaccessible to future draws. The GPU may still be processing + // draws that reference the old contents. With this hint it can + // assign a different allocation for the new contents to avoid + // flushing the gpu past draws consuming the old contents. + GL_CALL(BufferData(GR_GL_ARRAY_BUFFER, + this->sizeInBytes(), NULL, usage)); + GL_CALL(BufferSubData(GR_GL_ARRAY_BUFFER, 0, srcSizeInBytes, src)); + } +#else + // Note that we're cheating on the size here. Currently no methods + // allow a partial update that preserves contents of non-updated + // portions of the buffer (lock() does a glBufferData(..size, NULL..)) + bool doSubData = false; #if GR_GL_MAC_BUFFER_OBJECT_PERFOMANCE_WORKAROUND - GrAssert(!doNullHint); static int N = 0; - doNullHint = (0 == N % 1024); + // 128 was chosen experimentally. At 256 a slight hitchiness was noticed + // when dragging a Chromium window around with a canvas tab backgrounded. + doSubData = 0 == (N % 128); ++N; #endif - if (doNullHint) { - if (this->sizeInBytes() == srcSizeInBytes) { - GL_CALL(BufferData(GR_GL_ARRAY_BUFFER, srcSizeInBytes, src, usage)); - } else { - // Before we call glBufferSubData we give the driver a hint using - // glBufferData with NULL. This makes the old buffer contents - // inaccessible to future draws. The GPU may still be processing - // draws that reference the old contents. With this hint it can - // assign a different allocation for the new contents to avoid - // flushing the gpu past draws consuming the old contents. - GL_CALL(BufferData(GR_GL_ARRAY_BUFFER, - this->sizeInBytes(), NULL, usage)); - GL_CALL(BufferSubData(GR_GL_ARRAY_BUFFER, 0, srcSizeInBytes, src)); - } + if (doSubData) { + // The workaround is to do a glBufferData followed by glBufferSubData. + // Chromium's command buffer may turn a glBufferSubData where the size + // exactly matches the buffer size into a glBufferData. So we tack 1 + // extra byte onto the glBufferData. + GL_CALL(BufferData(GR_GL_ARRAY_BUFFER, srcSizeInBytes + 1, + NULL, usage)); + GL_CALL(BufferSubData(GR_GL_ARRAY_BUFFER, 0, srcSizeInBytes, src)); } else { - // Note that we're cheating on the size here. Currently no methods - // allow a partial update that preserves contents of non-updated - // portions of the buffer (lock() does a glBufferData(..size, NULL..)) GL_CALL(BufferData(GR_GL_ARRAY_BUFFER, srcSizeInBytes, src, usage)); } +#endif return true; } |