diff options
author | Robert Phillips <robertphillips@google.com> | 2017-05-12 14:49:16 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-12 19:20:22 +0000 |
commit | 8a02f65c5cc16d010f188c34861b03d96cb8ec10 (patch) | |
tree | e90adb6d5167987d1b93fb3c0ba2511ff435bdc0 /src/gpu/GrProgramDesc.cpp | |
parent | 177266339c3aa6dda4fa2912af9eaa8e8206f78f (diff) |
Switch ImageStorageAccess over to GrTextureProxies
Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))
Change-Id: I341de6ae121620d30e50bff21450878a18bdf4f2
Reviewed-on: https://skia-review.googlesource.com/16714
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrProgramDesc.cpp')
-rw-r--r-- | src/gpu/GrProgramDesc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp index 86c653d647..41993e190d 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/GrProgramDesc.cpp @@ -62,7 +62,7 @@ static uint16_t sampler_key(GrSLType samplerType, GrPixelConfig config, GrShader } static uint16_t storage_image_key(const GrResourceIOProcessor::ImageStorageAccess& imageAccess) { - GrSLType type = imageAccess.texture()->texturePriv().imageStorageType(); + GrSLType type = imageAccess.proxy()->imageStorageType(); return image_storage_or_sampler_uniform_type_key(type) | (int)imageAccess.format() << kSamplerOrImageTypeKeyBits; } |