Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Unified Diff: src/gpu/vk/GrVkPipelineState.h

Issue 1906623002: Update min Vulkan version to 1.0.8.0, and fix various bugs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/vk/GrVkImage.cpp ('k') | src/gpu/vk/GrVkPipelineState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/vk/GrVkPipelineState.h
diff --git a/src/gpu/vk/GrVkPipelineState.h b/src/gpu/vk/GrVkPipelineState.h
index 2bfc16cf56bb6dcc2e95ddd6f031780379cb6dc3..ad3afa7314b2261808ae8627d7c603fa198f06cf 100644
--- a/src/gpu/vk/GrVkPipelineState.h
+++ b/src/gpu/vk/GrVkPipelineState.h
@@ -166,10 +166,11 @@ private:
uint32_t descCount, GrVkGpu* gpu)
: fDescLayout(layout)
, fDescType(type)
- , fCurrentDescriptorSet(0)
+ , fDescCountPerSet(descCount)
+ , fCurrentDescriptorCount(0)
, fPool(nullptr) {
- SkASSERT(descCount < (kMaxDescSetLimit >> 2));
- fMaxDescriptorSets = descCount << 2;
+ SkASSERT(descCount < kMaxDescLimit >> 2);
+ fMaxDescriptors = fDescCountPerSet << 2;
this->getNewPool(gpu);
}
@@ -185,12 +186,13 @@ private:
VkDescriptorSetLayout fDescLayout;
VkDescriptorType fDescType;
- uint32_t fMaxDescriptorSets;
- uint32_t fCurrentDescriptorSet;
+ uint32_t fDescCountPerSet;
+ uint32_t fMaxDescriptors;
+ uint32_t fCurrentDescriptorCount;
GrVkDescriptorPool* fPool;
private:
- static const uint32_t kMaxDescSetLimit = 1 << 10;
+ static const uint32_t kMaxDescLimit = 1 << 10;
void getNewPool(GrVkGpu* gpu);
};
« no previous file with comments | « src/gpu/vk/GrVkImage.cpp ('k') | src/gpu/vk/GrVkPipelineState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698