commit 2245803fcdabbbf216519ef708e1ec84e197e1fb
author csmartdalton <csmartdalton@google.com> Wed Nov 16 11:28:16 2016 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 16 19:34:48 2016 +0000
tree 429b604e7165982eff339f9d5ce32e99b89814a9
parent 2a51de82ceb6790f329b9f4cc85e61f34fc2d0d4

Rename GrTextureBufferSampler to GrBufferSampler

Just a simple renaming to reinforce the Ganesh notion that a buffer
access is not related to a texture.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4879

Change-Id: I3f12b6eccff744e246618be0a7abf41c4a1228a1
Reviewed-on: https://skia-review.googlesource.com/4879
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index fa728ed..ea2a528 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -19,7 +19,7 @@
                             const GrGLSLCaps& caps) {
     enum {
         kFirstSamplerType = kTexture2DSampler_GrSLType,
-        kLastSamplerType = kTextureBufferSampler_GrSLType,
+        kLastSamplerType = kBufferSampler_GrSLType,
         kSamplerTypeKeyBits = 4
     };
     GR_STATIC_ASSERT(kLastSamplerType - kFirstSamplerType < (1 << kSamplerTypeKeyBits));
@@ -51,7 +51,7 @@
     }
     for (; i < numSamplers; ++i) {
         const GrBufferAccess& access = proc.bufferAccess(i - numTextures);
-        k16[i] = sampler_key(kTextureBufferSampler_GrSLType, access.texelConfig(),
+        k16[i] = sampler_key(kBufferSampler_GrSLType, access.texelConfig(),
                              access.visibility(), caps);
     }
     // zero the last 16 bits if the number of samplers is odd.

src/gpu/glsl/GrGLSL.h

diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/glsl/GrGLSL.h
index 872c618..4461f4c 100644
--- a/src/gpu/glsl/GrGLSL.h
+++ b/src/gpu/glsl/GrGLSL.h
@@ -134,7 +134,7 @@
             return "samplerExternalOES";
         case kTexture2DRectSampler_GrSLType:
             return "sampler2DRect";
-        case kTextureBufferSampler_GrSLType:
+        case kBufferSampler_GrSLType:
             return "samplerBuffer";
         case kBool_GrSLType:
             return "bool";

src/gpu/glsl/GrGLSLProgramBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
index 5b1fbe1..0862bc4 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -266,7 +266,7 @@
         for (int b = 0; b < numBuffers; ++b) {
             const GrBufferAccess& access = processor.bufferAccess(b);
             name.printf("BufferSampler_%d", outBufferSamplers->count());
-            this->emitSampler(kTextureBufferSampler_GrSLType, access.texelConfig(), name.c_str(),
+            this->emitSampler(kBufferSampler_GrSLType, access.texelConfig(), name.c_str(),
                               access.visibility(), outBufferSamplers);
             texelBufferVisibility |= access.visibility();
         }

src/gpu/vk/GrVkUniformHandler.cpp

diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp
index dcfefbf..212095a 100644
--- a/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/src/gpu/vk/GrVkUniformHandler.cpp
@@ -42,7 +42,7 @@
         case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kTextureBufferSampler_GrSLType:
+        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             break;
@@ -83,7 +83,7 @@
         case kITexture2DSampler_GrSLType:
         case kTextureExternalSampler_GrSLType:
         case kTexture2DRectSampler_GrSLType:
-        case kTextureBufferSampler_GrSLType:
+        case kBufferSampler_GrSLType:
         case kTexture2D_GrSLType:
         case kSampler_GrSLType:
             break;

src/gpu/vk/GrVkVaryingHandler.cpp

diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/vk/GrVkVaryingHandler.cpp
index 7ea2f18..099e096 100644
--- a/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -35,7 +35,7 @@
              return 0;
         case kTexture2DRectSampler_GrSLType:
              return 0;
-        case kTextureBufferSampler_GrSLType:
+        case kBufferSampler_GrSLType:
              return 0;
         case kBool_GrSLType:
              return 1;