diff options
author | 2016-03-11 10:07:37 -0800 | |
---|---|---|
committer | 2016-03-11 10:07:37 -0800 | |
commit | 9c3f14327a38e79ab7d0cf30dfd9bf89676fde06 (patch) | |
tree | f4695cc85cf19bf471ed8c956083f2234f18d4e1 /src/gpu/vk/GrVkCaps.h | |
parent | 6b563156eb7ce05b51997695ec9ab2aedcc2e6b1 (diff) |
Add support for vertex and geometry shader textures
Adds a visibility bitfield to GrTextureAccess that controls in which
shaders the texture should be accessible. Also adds caps and
validation to ensure we don't exceed texture limits.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1782583002
Review URL: https://codereview.chromium.org/1782583002
Diffstat (limited to 'src/gpu/vk/GrVkCaps.h')
-rw-r--r-- | src/gpu/vk/GrVkCaps.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h index 579f8a757e..39be89e571 100644 --- a/src/gpu/vk/GrVkCaps.h +++ b/src/gpu/vk/GrVkCaps.h @@ -65,17 +65,6 @@ 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: @@ -84,7 +73,7 @@ private: 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); @@ -103,8 +92,6 @@ private: SkTArray<StencilFormat, true> fLinearStencilFormats; SkTArray<StencilFormat, true> fStencilFormats; - int fMaxSampledTextures; - typedef GrCaps INHERITED; }; |