Revert of Add support for glMapBufferRange. Use glMapBufferRange and glMapBufferSubData.

src/gpu/gl/GrGLCreateNullInterface.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "gl/GrGLInterface.h"
 #include "GrGLDefines.h"
@@ skipping 168 matching lines @@
         }
         if (ids[i] == gCurrElementArrayBuffer) {
             gCurrElementArrayBuffer = 0;
         }
 
         GrBufferObj* buffer = look_up(ids[i]);
         delete_buffer(buffer);
     }
 }
 
-GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBufferRange(GrGLenum target, GrGLintptr offset,
-                                                   GrGLsizeiptr length, GrGLbitfield access) {
+GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBuffer(GrGLenum target, GrGLenum access) {
+
     GrGLuint id = 0;
     switch (target) {
         case GR_GL_ARRAY_BUFFER:
             id = gCurrArrayBuffer;
             break;
         case GR_GL_ELEMENT_ARRAY_BUFFER:
             id = gCurrElementArrayBuffer;
             break;
     }
 
     if (id > 0) {
-        // We just ignore the offset and length here.
-        GrBufferObj* buffer = look_up(id);
-        SkASSERT(!buffer->mapped());
-        buffer->setMapped(true);
-        return buffer->dataPtr();
-    }
-    return NULL;
-}
-
-GrGLvoid* GR_GL_FUNCTION_TYPE nullGLMapBuffer(GrGLenum target, GrGLenum access) {
-    GrGLuint id = 0;
-    switch (target) {
-        case GR_GL_ARRAY_BUFFER:
-            id = gCurrArrayBuffer;
-            break;
-        case GR_GL_ELEMENT_ARRAY_BUFFER:
-            id = gCurrElementArrayBuffer;
-            break;
-    }
-
-    if (id > 0) {
         GrBufferObj* buffer = look_up(id);
         SkASSERT(!buffer->mapped());
         buffer->setMapped(true);
         return buffer->dataPtr();
     }
 
     SkASSERT(false);
     return NULL;            // no buffer bound to target
 }
 
-GrGLvoid GR_GL_FUNCTION_TYPE nullGLFlushMappedBufferRange(GrGLenum target,
-                                                          GrGLintptr offset,
-                                                          GrGLsizeiptr length) {}
-
-
 GrGLboolean GR_GL_FUNCTION_TYPE nullGLUnmapBuffer(GrGLenum target) {
     GrGLuint id = 0;
     switch (target) {
     case GR_GL_ARRAY_BUFFER:
         id = gCurrArrayBuffer;
         break;
     case GR_GL_ELEMENT_ARRAY_BUFFER:
         id = gCurrElementArrayBuffer;
         break;
     }
@@ skipping 75 matching lines @@
     functions->fDisableVertexAttribArray = noOpGLDisableVertexAttribArray;
     functions->fDrawArrays = noOpGLDrawArrays;
     functions->fDrawBuffer = noOpGLDrawBuffer;
     functions->fDrawBuffers = noOpGLDrawBuffers;
     functions->fDrawElements = noOpGLDrawElements;
     functions->fEnable = noOpGLEnable;
     functions->fEnableVertexAttribArray = noOpGLEnableVertexAttribArray;
     functions->fEndQuery = noOpGLEndQuery;
     functions->fFinish = noOpGLFinish;
     functions->fFlush = noOpGLFlush;
-    functions->fFlushMappedBufferRange = nullGLFlushMappedBufferRange;
     functions->fFrontFace = noOpGLFrontFace;
     functions->fGenBuffers = nullGLGenBuffers;
     functions->fGenerateMipmap = nullGLGenerateMipmap;
     functions->fGenQueries = noOpGLGenIds;
     functions->fGenTextures = noOpGLGenIds;
     functions->fGenVertexArrays = noOpGLGenIds;
     functions->fGetBufferParameteriv = nullGLGetBufferParameteriv;
     functions->fGetError = noOpGLGetError;
     functions->fGetIntegerv = noOpGLGetIntegerv;
     functions->fGetQueryObjecti64v = noOpGLGetQueryObjecti64v;
     functions->fGetQueryObjectiv = noOpGLGetQueryObjectiv;
     functions->fGetQueryObjectui64v = noOpGLGetQueryObjectui64v;
     functions->fGetQueryObjectuiv = noOpGLGetQueryObjectuiv;
     functions->fGetQueryiv = noOpGLGetQueryiv;
     functions->fGetProgramInfoLog = noOpGLGetInfoLog;
     functions->fGetProgramiv = noOpGLGetShaderOrProgramiv;
     functions->fGetShaderInfoLog = noOpGLGetInfoLog;
     functions->fGetShaderiv = noOpGLGetShaderOrProgramiv;
     functions->fGetString = noOpGLGetString;
     functions->fGetStringi = noOpGLGetStringi;
     functions->fGetTexLevelParameteriv = noOpGLGetTexLevelParameteriv;
     functions->fGetUniformLocation = noOpGLGetUniformLocation;
     functions->fInsertEventMarker = noOpGLInsertEventMarker;
     functions->fLineWidth = noOpGLLineWidth;
     functions->fLinkProgram = noOpGLLinkProgram;
-    functions->fMapBuffer = nullGLMapBuffer;
-    functions->fMapBufferRange = nullGLMapBufferRange;
     functions->fPixelStorei = nullGLPixelStorei;
     functions->fPopGroupMarker = noOpGLPopGroupMarker;
     functions->fPushGroupMarker = noOpGLPushGroupMarker;
     functions->fQueryCounter = noOpGLQueryCounter;
     functions->fReadBuffer = noOpGLReadBuffer;
     functions->fReadPixels = nullGLReadPixels;
     functions->fScissor = noOpGLScissor;
     functions->fShaderSource = noOpGLShaderSource;
     functions->fStencilFunc = noOpGLStencilFunc;
     functions->fStencilFuncSeparate = noOpGLStencilFuncSeparate;
@@ skipping 19 matching lines @@
     functions->fUniform3i = noOpGLUniform3i;
     functions->fUniform3fv = noOpGLUniform3fv;
     functions->fUniform3iv = noOpGLUniform3iv;
     functions->fUniform4f = noOpGLUniform4f;
     functions->fUniform4i = noOpGLUniform4i;
     functions->fUniform4fv = noOpGLUniform4fv;
     functions->fUniform4iv = noOpGLUniform4iv;
     functions->fUniformMatrix2fv = noOpGLUniformMatrix2fv;
     functions->fUniformMatrix3fv = noOpGLUniformMatrix3fv;
     functions->fUniformMatrix4fv = noOpGLUniformMatrix4fv;
-    functions->fUnmapBuffer = nullGLUnmapBuffer;
     functions->fUseProgram = nullGLUseProgram;
     functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv;
     functions->fVertexAttribPointer = noOpGLVertexAttribPointer;
     functions->fViewport = nullGLViewport;
     functions->fBindFramebuffer = nullGLBindFramebuffer;
     functions->fBindRenderbuffer = nullGLBindRenderbuffer;
     functions->fCheckFramebufferStatus = noOpGLCheckFramebufferStatus;
     functions->fDeleteFramebuffers = nullGLDeleteFramebuffers;
     functions->fDeleteRenderbuffers = nullGLDeleteRenderbuffers;
     functions->fFramebufferRenderbuffer = nullGLFramebufferRenderbuffer;
     functions->fFramebufferTexture2D = nullGLFramebufferTexture2D;
     functions->fGenFramebuffers = noOpGLGenIds;
     functions->fGenRenderbuffers = noOpGLGenIds;
     functions->fGetFramebufferAttachmentParameteriv = noOpGLGetFramebufferAttachmentParameteriv;
     functions->fGetRenderbufferParameteriv = noOpGLGetRenderbufferParameteriv;
     functions->fRenderbufferStorage = noOpGLRenderbufferStorage;
     functions->fRenderbufferStorageMultisample = noOpGLRenderbufferStorageMultisample;
     functions->fBlitFramebuffer = noOpGLBlitFramebuffer;
     functions->fResolveMultisampleFramebuffer = noOpGLResolveMultisampleFramebuffer;
+    functions->fMapBuffer = nullGLMapBuffer;
     functions->fMatrixLoadf = noOpGLMatrixLoadf;
     functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity;
+    functions->fUnmapBuffer = nullGLUnmapBuffer;
     functions->fBindFragDataLocationIndexed = noOpGLBindFragDataLocationIndexed;
 
     interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functions->fGetStringi,
                                 functions->fGetIntegerv);
     return interface;
 }