fix unsigned/signed warning on linux for GrVkDescriptorPool::numPoolSizes()

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1724493002

Review URL: https://codereview.chromium.org/1724493002

diff --git a/src/gpu/vk/GrVkDescriptorPool.cpp b/src/gpu/vk/GrVkDescriptorPool.cpp
index d4dced6c32c35c7f6a1130cc16ece19bd9adcfce..48880b64db2c32c9951113eda11baa1746055c11 100644 (file)
--- a/src/gpu/vk/GrVkDescriptorPool.cpp
+++ b/src/gpu/vk/GrVkDescriptorPool.cpp
@@ -14,7 +14,7 @@
 GrVkDescriptorPool::GrVkDescriptorPool(const GrVkGpu* gpu, const DescriptorTypeCounts& typeCounts)
     : INHERITED()
     , fTypeCounts(typeCounts) {
-    uint32_t numPools = fTypeCounts.numPoolSizes();
+    int numPools = fTypeCounts.numPoolSizes();
     SkAutoTDeleteArray<VkDescriptorPoolSize> poolSizes(new VkDescriptorPoolSize[numPools]);
     int currentPool = 0;
     for (int i = VK_DESCRIPTOR_TYPE_BEGIN_RANGE; i < VK_DESCRIPTOR_TYPE_END_RANGE; ++i) {
@@ -57,8 +57,8 @@ void GrVkDescriptorPool::freeGPUData(const GrVkGpu* gpu) const {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-uint32_t GrVkDescriptorPool::DescriptorTypeCounts::numPoolSizes() const {
-    uint32_t count = 0;
+int GrVkDescriptorPool::DescriptorTypeCounts::numPoolSizes() const {
+    int count = 0;
     for (int i = VK_DESCRIPTOR_TYPE_BEGIN_RANGE; i < VK_DESCRIPTOR_TYPE_END_RANGE; ++i) {
         count += fDescriptorTypeCount[i] ? 1 : 0;
     }

diff --git a/src/gpu/vk/GrVkDescriptorPool.h b/src/gpu/vk/GrVkDescriptorPool.h
index ebbf230708d55a615d2b32c515cd3300b5ee9747..b20b01827ca8aac38b553bb6f7566fad5bdc7ae2 100644 (file)
--- a/src/gpu/vk/GrVkDescriptorPool.h
+++ b/src/gpu/vk/GrVkDescriptorPool.h
@@ -23,7 +23,7 @@ public:
         }
 
         void setTypeCount(VkDescriptorType type, uint8_t count);
-        uint32_t numPoolSizes() const;
+        int numPoolSizes() const;
 
         // Determines if for each i, that.fDescriptorTypeCount[i] <= fDescriptorTypeCount[i];
         bool isSuperSet(const DescriptorTypeCounts& that) const;
@@ -52,5 +52,4 @@ private:
     typedef GrVkResource INHERITED;
 };
 
-
-#endif
\ No newline at end of file
+#endif