Abandon offset support with texel buffers

src/gpu/gl/GrGLGpu.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 "GrGLGpu.h"
 #include "GrGLBuffer.h"
 #include "GrGLGLSL.h"
@@ skipping 3206 matching lines @@
     }
     if (this->glCaps().textureSwizzleSupport() &&
         (setAll || memcmp(newTexParams.fSwizzleRGBA,
                           oldTexParams.fSwizzleRGBA,
                           sizeof(newTexParams.fSwizzleRGBA)))) {
         this->setTextureSwizzle(unitIdx, target, newTexParams.fSwizzleRGBA);
     }
     texture->setCachedTexParams(newTexParams, this->getResetTimestamp());
 }
 
-void GrGLGpu::bindTexelBuffer(int unitIdx, intptr_t offsetInBytes, GrPixelConfig texelConfig,
-                              GrGLBuffer* buffer) {
+void GrGLGpu::bindTexelBuffer(int unitIdx, GrPixelConfig texelConfig, GrGLBuffer* buffer) {
     SkASSERT(this->glCaps().canUseConfigWithTexelBuffer(texelConfig));
     SkASSERT(unitIdx >= 0 && unitIdx < fHWBufferTextures.count());
-    SkASSERT(offsetInBytes >= 0 && offsetInBytes < (intptr_t) buffer->glSizeInBytes());
 
     BufferTexture& buffTex = fHWBufferTextures[unitIdx];
 
     if (!buffTex.fKnownBound) {
         if (!buffTex.fTextureID) {
             GL_CALL(GenTextures(1, &buffTex.fTextureID));
             if (!buffTex.fTextureID) {
                 return;
             }
         }
 
         this->setTextureUnit(unitIdx);
         GL_CALL(BindTexture(GR_GL_TEXTURE_BUFFER, buffTex.fTextureID));
 
         buffTex.fKnownBound = true;
     }
 
     if (buffer->getUniqueID() != buffTex.fAttachedBufferUniqueID ||
-        buffTex.fOffsetInBytes != offsetInBytes ||
-        buffTex.fTexelConfig != texelConfig ||
-        buffTex.fAttachedSizeInBytes != buffer->glSizeInBytes() - offsetInBytes) {
-
-        size_t attachmentSizeInBytes = buffer->glSizeInBytes() - offsetInBytes;
+        buffTex.fTexelConfig != texelConfig) {
 
         this->setTextureUnit(unitIdx);
-        GL_CALL(TexBufferRange(GR_GL_TEXTURE_BUFFER,
-                               this->glCaps().configSizedInternalFormat(texelConfig),
-                               buffer->bufferID(),
-                               offsetInBytes,
-                               attachmentSizeInBytes));
+        GL_CALL(TexBuffer(GR_GL_TEXTURE_BUFFER,
+                          this->glCaps().configSizedInternalFormat(texelConfig),
+                          buffer->bufferID()));
 
-        buffTex.fOffsetInBytes = offsetInBytes;
         buffTex.fTexelConfig = texelConfig;
-        buffTex.fAttachedSizeInBytes = attachmentSizeInBytes;
         buffTex.fAttachedBufferUniqueID = buffer->getUniqueID();
 
         if (this->glCaps().textureSwizzleSupport() &&
             this->glCaps().configSwizzle(texelConfig) != buffTex.fSwizzle) {
             GrGLenum glSwizzle[4];
             get_tex_param_swizzle(texelConfig, this->glCaps(), glSwizzle);
             this->setTextureSwizzle(unitIdx, GR_GL_TEXTURE_BUFFER, glSwizzle);
             buffTex.fSwizzle = this->glCaps().configSwizzle(texelConfig);
         }
 
@@ skipping 969 matching lines @@
         if (GR_GL_TEXTURE_EXTERNAL == glTexture->target() ||
             GR_GL_TEXTURE_RECTANGLE == glTexture->target()) {
             copyParams->fFilter = GrTextureParams::kNone_FilterMode;
             copyParams->fWidth = texture->width();
             copyParams->fHeight = texture->height();
             return true;
         }
     }
     return false;
 }