| Index: src/gpu/vk/GrVkCaps.h
|
| diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h
|
| index 3135c9e46ea9097dcb123af0cdbda5bb77b81d50..5e9fad8056e4cb843a0852b1da6f6780c7c476dd 100644
|
| --- a/src/gpu/vk/GrVkCaps.h
|
| +++ b/src/gpu/vk/GrVkCaps.h
|
| @@ -65,24 +65,14 @@ public:
|
| 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 initSampleCount(const VkPhysicalDeviceProperties& properties);
|
| - void initGLSLCaps(const GrVkInterface* interface, VkPhysicalDevice physDev);
|
| + void initGLSLCaps(const GrVkInterface* interface, VkPhysicalDevice physDev,
|
| + const VkPhysicalDeviceProperties&);
|
| void initConfigRenderableTable(const GrVkInterface* interface, VkPhysicalDevice physDev);
|
| void initConfigTexturableTable(const GrVkInterface* interface, VkPhysicalDevice physDev);
|
| void initStencilFormats(const GrVkInterface* interface, VkPhysicalDevice physDev);
|
| @@ -100,8 +90,6 @@ private:
|
| SkTArray<StencilFormat, true> fLinearStencilFormats;
|
| SkTArray<StencilFormat, true> fStencilFormats;
|
|
|
| - int fMaxSampledTextures;
|
| -
|
| typedef GrCaps INHERITED;
|
| };
|
|
|
|
|