diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-16 16:12:23 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-16 16:12:23 +0000 |
| commit | dc3134c0f508ddd43c5a8d3fef30d2dd5be361ea (patch) | |
| tree | 4714535f3e13aca8bd5ebe89d4eb01d0b24d9628 | |
| parent | a8916ffd90c04dc6cc1fb9ba94af2ff950284fad (diff) | |
Always support pack/unpack row length on ES3. Add support for NV_pack_subimage extension.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://chromiumcodereview.appspot.com/23003009
git-svn-id: http://skia.googlecode.com/svn/trunk@10778 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 61ef8524a6..5ddf21caf5 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -147,10 +147,11 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { fPackRowLengthSupport = true; fPackFlipYSupport = false; } else { - fUnpackRowLengthSupport =ctxInfo.hasExtension("GL_EXT_unpack_subimage"); + fUnpackRowLengthSupport = version >= GR_GL_VER(3,0) || + ctxInfo.hasExtension("GL_EXT_unpack_subimage"); fUnpackFlipYSupport = ctxInfo.hasExtension("GL_CHROMIUM_flipy"); - // no extension for pack row length - fPackRowLengthSupport = false; + fPackRowLengthSupport = version >= GR_GL_VER(3,0) || + ctxInfo.hasExtension("GL_NV_pack_subimage"); fPackFlipYSupport = ctxInfo.hasExtension("GL_ANGLE_pack_reverse_row_order"); } |