AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
bsalomon 2016-02-22 13:09:26 -08:00 committed by Commit bot
parent f853594cc1
commit bc2f4dfd41
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gpu/vk/GrVkDescriptorPool.cpp
View File

@ -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;
}

5
src/gpu/vk/GrVkDescriptorPool.h
View File

@ -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
#endif