Fix GL texture target program key

src/gpu/gl/GrGLProgramDesc.cpp

Index: src/gpu/gl/GrGLProgramDesc.cpp
diff --git a/src/gpu/gl/GrGLProgramDesc.cpp b/src/gpu/gl/GrGLProgramDesc.cpp
index 5edacf5721859d86e484f882d52053dca3eacc73..cfb10b2eaa91935370aea8bdf4917ef1d74028e6 100644
--- a/src/gpu/gl/GrGLProgramDesc.cpp
+++ b/src/gpu/gl/GrGLProgramDesc.cpp
@@ -17,8 +17,17 @@
 #include "glsl/GrGLSLCaps.h"
 
 static uint16_t texture_target_key(GrGLenum target) {
-    SkASSERT((uint32_t)target < SK_MaxU16);
-    return target;
+    switch (target) {
+        case GR_GL_TEXTURE_2D:
+            return 0;
+        case GR_GL_TEXTURE_EXTERNAL:
+            return 1;
+        case GR_GL_TEXTURE_RECTANGLE:
+            return 2;
+        default:
+            SkFAIL("Unexpected texture target.");
+            return 0;
+    }
 }
 
 static void add_texture_key(GrProcessorKeyBuilder* b, const GrProcessor& proc,
@@ -33,8 +42,8 @@ static void add_texture_key(GrProcessorKeyBuilder* b, const GrProcessor& proc,
     for (int i = 0; i < numTextures; ++i) {
         const GrTextureAccess& access = proc.textureAccess(i);
         GrGLTexture* texture = static_cast<GrGLTexture*>(access.getTexture());
-        k16[i] = caps.configTextureSwizzle(texture->config()).asKey() |
-                 (texture_target_key(texture->target()) << 16);
+        k16[i] = SkToU16(caps.configTextureSwizzle(texture->config()).asKey() |
+                         (texture_target_key(texture->target()) << 8));

[egdaniel, 2016/01/15 15:40:28]

Do we want texture_target_key to return a uint8_t? Obviously now in the current
form this is all safe knowing what texture_target_key returns, but we either
need an assert on the size of the return value or change to uint8 to make sure
we don't lose bits in the future.

     }
     // zero the last 16 bits if the number of textures is odd.
     if (numTextures & 0x1) {