diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-06-21 15:50:46 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-21 15:50:51 +0000 |
| commit | ce57552e11776c8f93798c3a2244fa378604b4af (patch) | |
| tree | ce812560eec646ab8335f25d57dfec1df7db5c4e /src/gpu/gl/GrGLCaps.cpp | |
| parent | f7037d003c936f59e4d02244821e223c2e7af8e8 (diff) | |
Revert "Clean up onTransferPixels"
This reverts commit f7037d003c936f59e4d02244821e223c2e7af8e8.
Reason for revert: Issues on test bots.
Original change's description:
> Clean up onTransferPixels
>
> Bug: skia:5126
> Change-Id: I323c50e7854744302007b4ae7bd25e5742c14cbc
> Reviewed-on: https://skia-review.googlesource.com/19055
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: I923fda4d5cd8c2896fb347f9b2695b7f83d9137b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:5126
Reviewed-on: https://skia-review.googlesource.com/20444
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLCaps.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index faea4e6395..95791f12bb 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -457,14 +457,10 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fTransferBufferType = kPBO_TransferBufferType; } } else { - if (version >= GR_GL_VER(3, 0) || - (ctxInfo.hasExtension("GL_NV_pixel_buffer_object") && - // GL_EXT_unpack_subimage needed to support subtexture rectangles - ctxInfo.hasExtension("GL_EXT_unpack_subimage"))) { + if (version >= GR_GL_VER(3, 0) || ctxInfo.hasExtension("GL_NV_pixel_buffer_object")) { fTransferBufferType = kPBO_TransferBufferType; -// TODO: get transfer buffers working in Chrome -// } else if (ctxInfo.hasExtension("GL_CHROMIUM_pixel_transfer_buffer_object")) { -// fTransferBufferType = kChromium_TransferBufferType; + } else if (ctxInfo.hasExtension("GL_CHROMIUM_pixel_transfer_buffer_object")) { + fTransferBufferType = kChromium_TransferBufferType; } } |