diff options
author | 2017-03-20 11:40:58 -0400 | |
---|---|---|
committer | 2017-03-20 20:35:04 +0000 | |
commit | c5cc2dee2595300da421e9d08157ed81a2022db9 (patch) | |
tree | 1ae4cc7ee0534ea69702526eba2cbfd7b123c1a4 /src | |
parent | 3b5bf35720c9f751f4df10666a5228ae134bbcdd (diff) |
Set maxVertexAttrib limit for Vulkan
BUG=skia:6396
Change-Id: If31507816ca9978a64d3bd25b282b373d292e7aa
Reviewed-on: https://skia-review.googlesource.com/9856
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 12 | ||||
-rw-r--r-- | src/gpu/vk/GrVkCaps.h | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index 16a91c1a1f..d185b17c78 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -145,7 +145,17 @@ void GrVkCaps::initSampleCount(const VkPhysicalDeviceProperties& properties) { void GrVkCaps::initGrCaps(const VkPhysicalDeviceProperties& properties, const VkPhysicalDeviceMemoryProperties& memoryProperties, uint32_t featureFlags) { - fMaxVertexAttributes = SkTMin(properties.limits.maxVertexInputAttributes, (uint32_t)INT_MAX); + // So GPUs, like AMD, are reporting MAX_INT support vertex attributes. In general, there is no + // need for us ever to support that amount, and it makes tests which tests all the vertex + // attribs timeout looping over that many. For now, we'll cap this at 64 max and can raise it if + // we ever find that need. + static const uint32_t kMaxVertexAttributes = 64; + fMaxVertexAttributes = SkTMin(properties.limits.maxVertexInputAttributes, kMaxVertexAttributes); + // AMD advertises support for MAX_UINT vertex input attributes, but in reality only supports 32. + if (kAMD_VkVendor == properties.vendorID) { + fMaxVertexAttributes = SkTMin(fMaxVertexAttributes, 32); + } + // We could actually query and get a max size for each config, however maxImageDimension2D will // give the minimum max size across all configs. So for simplicity we will use that for now. fMaxRenderTargetSize = SkTMin(properties.limits.maxImageDimension2D, (uint32_t)INT_MAX); diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h index 6ef0796257..e04bc16497 100644 --- a/src/gpu/vk/GrVkCaps.h +++ b/src/gpu/vk/GrVkCaps.h @@ -91,9 +91,10 @@ public: private: enum VkVendor { - kQualcomm_VkVendor = 20803, - kNvidia_VkVendor = 4318, + kAMD_VkVendor = 4098, kImagination_VkVendor = 4112, + kNvidia_VkVendor = 4318, + kQualcomm_VkVendor = 20803, }; void init(const GrContextOptions& contextOptions, const GrVkInterface* vkInterface, |