From f9deb8a15de8061863b38839850207f63a8e47e4 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 2 May 2014 15:08:18 +0000 Subject: Add support for glMapBufferRange. Use glMapBufferRange and glMapBufferSubData. BUG=skia:2402 R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/243413002 git-svn-id: http://skia.googlecode.com/svn/trunk@14533 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/gl/GrGLInterface.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/gpu/gl/GrGLInterface.cpp') diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp index 056a601874..ee184d0a56 100644 --- a/src/gpu/gl/GrGLInterface.cpp +++ b/src/gpu/gl/GrGLInterface.cpp @@ -486,8 +486,8 @@ bool GrGLInterface::validate() const { } } -#if 0 // This can be enabled once Chromium is updated to set these functions pointers. - if ((kGL_GrGLStandard == fStandard) || fExtensions.has("GL_ARB_invalidate_subdata")) { + if ((kGL_GrGLStandard == fStandard && glVer >= GR_GL_VER(4,3)) || + fExtensions.has("GL_ARB_invalidate_subdata")) { if (NULL == fFunctions.fInvalidateBufferData || NULL == fFunctions.fInvalidateBufferSubData || NULL == fFunctions.fInvalidateFramebuffer || @@ -496,7 +496,7 @@ bool GrGLInterface::validate() const { NULL == fFunctions.fInvalidateTexSubImage) { RETURN_FALSE_INTERFACE; } - } else if (glVer >= GR_GL_VER(3,0)) { + } else if (kGLES_GrGLStandard == fStandard && glVer >= GR_GL_VER(3,0)) { // ES 3.0 adds the framebuffer functions but not the others. if (NULL == fFunctions.fInvalidateFramebuffer || NULL == fFunctions.fInvalidateSubFramebuffer) { @@ -512,7 +512,15 @@ bool GrGLInterface::validate() const { RETURN_FALSE_INTERFACE; } } -#endif + // These functions are added to the 3.0 version of both GLES and GL. + if (glVer >= GR_GL_VER(3,0) || + (kGLES_GrGLStandard == fStandard && fExtensions.has("GL_EXT_map_buffer_range")) || + (kGL_GrGLStandard == fStandard && fExtensions.has("GL_ARB_map_buffer_range"))) { + if (NULL == fFunctions.fMapBufferRange || + NULL == fFunctions.fFlushMappedBufferRange) { + RETURN_FALSE_INTERFACE; + } + } return true; } -- cgit v1.2.3