Add support for vertex and geometry shader textures

src/gpu/vk/GrVkCaps.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrVkCaps_DEFINED
 #define GrVkCaps_DEFINED
 
@@ skipping 47 matching lines @@
     }
 
     /**
      * Gets an array of legal stencil formats. These formats are not guaranteed to be supported by
      * the driver but are legal VK_TEXTURE_FORMATs.
      */
     const SkTArray<StencilFormat, true>& linearStencilFormats() const {
         return fLinearStencilFormats;
     }
 
-    /**
-     * Returns the max number of sampled textures we can use in a program. This number is the max of
-     * max samplers and max sampled images. This number is technically the max sampled textures we
-     * can have per stage, but we'll use it for the whole program since for now we only do texture
-     * lookups in the fragment shader.
-     */
-    int maxSampledTextures() const {
-        return fMaxSampledTextures;
-    }
-
-
     GrGLSLCaps* glslCaps() const { return reinterpret_cast<GrGLSLCaps*>(fShaderCaps.get()); }
 
 private:
     void init(const GrContextOptions& contextOptions, const GrVkInterface* vkInterface,
               VkPhysicalDevice device);
     void initGrCaps(const VkPhysicalDeviceProperties&,
                     const VkPhysicalDeviceFeatures&,
                     const VkPhysicalDeviceMemoryProperties&);
-    void initGLSLCaps(const VkPhysicalDeviceFeatures& features);
+    void initGLSLCaps(const VkPhysicalDeviceFeatures&, const VkPhysicalDeviceProperties&);
     void initSampleCount(const VkPhysicalDeviceProperties& properties);
     void initConfigRenderableTable(const GrVkInterface* interface, VkPhysicalDevice physDev);
     void initConfigTexturableTable(const GrVkInterface* interface, VkPhysicalDevice physDev);
     void initStencilFormats(const GrVkInterface* interface, VkPhysicalDevice physDev);
 
 
     bool fConfigTextureSupport[kGrPixelConfigCnt];
     // For Vulkan we track whether a config is supported linearly (without need for swizzling)
     bool fConfigLinearTextureSupport[kGrPixelConfigCnt];
 
     // The first entry for each config is without msaa and the second is with.
     bool fConfigRenderSupport[kGrPixelConfigCnt][2];
     // The first entry for each config is without msaa and the second is with.
     bool fConfigLinearRenderSupport[kGrPixelConfigCnt][2];
 
     SkTArray<StencilFormat, true> fLinearStencilFormats;
     SkTArray<StencilFormat, true> fStencilFormats;
 
-    int fMaxSampledTextures;
-
     typedef GrCaps INHERITED;
 };
 
 #endif