diff options
| author |  csmartdalton <csmartdalton@google.com> | 2016-11-16 11:28:16 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-16 19:34:48 +0000 |
| commit | 2245803fcdabbbf216519ef708e1ec84e197e1fb (patch) | |
| tree | 429b604e7165982eff339f9d5ce32e99b89814a9 /src/gpu/GrProgramDesc.cpp | |
| parent | 2a51de82ceb6790f329b9f4cc85e61f34fc2d0d4 (diff) | |
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>
Diffstat (limited to 'src/gpu/GrProgramDesc.cpp')
| -rw-r--r-- | src/gpu/GrProgramDesc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp index fa728ed682..ea2a528319 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/GrProgramDesc.cpp @@ -19,7 +19,7 @@ static uint16_t sampler_key(GrSLType samplerType, GrPixelConfig config, GrShader 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 @@ static void add_sampler_keys(GrProcessorKeyBuilder* b, const GrProcessor& proc, } 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. |