commit 68ba117a6fe07ae029e26bc1901ac0edf4a371e0
author Brian Salomon <bsalomon@google.com> Wed Jun 05 11:15:08 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jun 05 15:42:30 2019 +0000
tree ed322807218a19862c5327c373a1e1707e24685c
parent 6386efa1dd1b8de596b7f7f9d26dd0b8c4748da4

GrShaderCaps always stores config texture swizzles.

Previously the swizzles were all "rgba" when GL texture swizzle was
used. This made it impossible to know the component mapping in that
case from API-neutral code.

Change-Id: I5e55fec87f0de2f8d43d8dc7759125482fccd91c
Bug: skia:8962
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218280
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index 344a2a5..05f8505 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -44,8 +44,12 @@
     int samplerTypeKey = texture_type_key(textureType);
 
     GR_STATIC_ASSERT(2 == sizeof(caps.configTextureSwizzle(config).asKey()));
+    uint16_t swizzleKey = 0;
+    if (caps.textureSwizzleAppliedInShader()) {
+        swizzleKey = caps.configTextureSwizzle(config).asKey();
+    }
     return SkToU32(samplerTypeKey |
-                   caps.configTextureSwizzle(config).asKey() << kSamplerOrImageTypeKeyBits |
+                   swizzleKey << kSamplerOrImageTypeKeyBits |
                    (GrSLSamplerPrecision(config) << (16 + kSamplerOrImageTypeKeyBits)));
 }