commit 8a02f65c5cc16d010f188c34861b03d96cb8ec10
author Robert Phillips <robertphillips@google.com> Fri May 12 14:49:16 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 12 19:20:22 2017 +0000
tree e90adb6d5167987d1b93fb3c0ba2511ff435bdc0
parent 177266339c3aa6dda4fa2912af9eaa8e8206f78f

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>

src/gpu/glsl/GrGLSLProgramBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
index 5c3bee1..96b3359 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -358,7 +358,7 @@
     if (access.visibility() & kFragment_GrShaderFlag) {
         ++fNumFragmentImageStorages;
     }
-    GrSLType uniformType = access.texture()->texturePriv().imageStorageType();
+    GrSLType uniformType = access.proxy()->imageStorageType();
     return this->uniformHandler()->addImageStorage(access.visibility(), uniformType,
                                                    access.format(), access.memoryModel(),
                                                    access.restrict(), access.ioType(), name);