mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
fix conflicts
This commit is contained in:
@@ -44,14 +44,14 @@ void *ThreadSafeLinearAllocator::allocate(size_t const size, size_t const alignm
|
||||
|
||||
void * allocatedMemory = nullptr;
|
||||
uint32_t oldUsedSize = 0;
|
||||
uint64_t newUsedSize = 0; // 为了判断溢出用64位
|
||||
uint64_t newUsedSize = 0; // using 64-bit integer to correctly detect overflows
|
||||
|
||||
do {
|
||||
oldUsedSize = getUsedSize();
|
||||
allocatedMemory = acl::align_to(acl::add_offset_to_ptr<void>(_buffer, oldUsedSize), alignment);
|
||||
newUsedSize = reinterpret_cast<uintptr_t>(allocatedMemory) - reinterpret_cast<uintptr_t>(_buffer) + size;
|
||||
|
||||
if (newUsedSize > _capacity) // 溢出
|
||||
if (newUsedSize > _capacity) // overflows
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ bool DeviceAgent::initialize(const DeviceInfo &info) {
|
||||
}
|
||||
((CommandBufferAgent *)_cmdBuff)->initMessageQueue();
|
||||
|
||||
setMultithreaded(true);
|
||||
//setMultithreaded(true);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -833,6 +833,7 @@ void CCVKCmdFuncUpdateBuffer(CCVKDevice *device, CCVKGPUBuffer *gpuBuffer, const
|
||||
|
||||
VkBufferCopy region{stagingBuffer.startOffset, gpuBuffer->startOffset, sizeToUpload};
|
||||
auto upload = [&stagingBuffer, &gpuBuffer, ®ion](const CCVKGPUCommandBuffer *gpuCommandBuffer) {
|
||||
#if BARRIER_DEDUCTION_LEVEL >= BARRIER_DEDUCTION_LEVEL_BASIC
|
||||
if (gpuBuffer->transferAccess) {
|
||||
CC_LOG_WARNING("updateBuffer: performance warning: buffer updated more than once per frame");
|
||||
// guard against WAW hazard
|
||||
@@ -844,6 +845,7 @@ void CCVKCmdFuncUpdateBuffer(CCVKDevice *device, CCVKGPUBuffer *gpuBuffer, const
|
||||
VK_PIPELINE_STAGE_TRANSFER_BIT,
|
||||
0, 1, &vkBarrier, 0, nullptr, 0, nullptr);
|
||||
}
|
||||
#endif
|
||||
vkCmdCopyBuffer(gpuCommandBuffer->vkCommandBuffer, stagingBuffer.vkBuffer, gpuBuffer->vkBuffer, 1, ®ion);
|
||||
};
|
||||
|
||||
|
||||
@@ -101,8 +101,8 @@ bool CCVKDescriptorSet::initialize(const DescriptorSetInfo &info) {
|
||||
_gpuDescriptorSet->instances.resize(gpuDevice->backBufferCount);
|
||||
|
||||
for (size_t t = 0u; t < gpuDevice->backBufferCount; ++t) {
|
||||
CCVKGPUDescriptorSet::DescriptorSetInstance &instance = _gpuDescriptorSet->instances[t];
|
||||
instance.vkDescriptorSet = gpuDescriptorSetLayout->pool.request(t);
|
||||
CCVKGPUDescriptorSet::Instance &instance = _gpuDescriptorSet->instances[t];
|
||||
instance.vkDescriptorSet = gpuDescriptorSetLayout->pool.request(t);
|
||||
instance.descriptorInfos.resize(descriptorCount, {});
|
||||
|
||||
for (size_t i = 0u, k = 0u; i < bindingCount; ++i) {
|
||||
|
||||
@@ -346,12 +346,12 @@ bool CCVKDevice::initialize(const DeviceInfo &info) {
|
||||
_gpuStagingBufferPools.push_back(CC_NEW(CCVKGPUStagingBufferPool(_gpuDevice)));
|
||||
}
|
||||
|
||||
_gpuBufferHub = CC_NEW(CCVKGPUBufferHub(_gpuDevice));
|
||||
_gpuTransportHub = CC_NEW(CCVKGPUTransportHub(_gpuDevice, ((CCVKQueue *)_queue)->gpuQueue()));
|
||||
_gpuDescriptorHub = CC_NEW(CCVKGPUDescriptorHub(_gpuDevice));
|
||||
_gpuSemaphorePool = CC_NEW(CCVKGPUSemaphorePool(_gpuDevice));
|
||||
_gpuBarrierManager = CC_NEW(CCVKGPUBarrierManager(_gpuDevice));
|
||||
_gpuDescriptorSetHub = CC_NEW(CCVKGPUDescriptorSetHub(_gpuDevice));
|
||||
_gpuBufferHub = CC_NEW(CCVKGPUBufferHub(_gpuDevice));
|
||||
_gpuTransportHub = CC_NEW(CCVKGPUTransportHub(_gpuDevice, ((CCVKQueue *)_queue)->gpuQueue()));
|
||||
_gpuDescriptorHub = CC_NEW(CCVKGPUDescriptorHub(_gpuDevice));
|
||||
_gpuSemaphorePool = CC_NEW(CCVKGPUSemaphorePool(_gpuDevice));
|
||||
_gpuBarrierManager = CC_NEW(CCVKGPUBarrierManager(_gpuDevice));
|
||||
_gpuDescriptorSetHub = CC_NEW(CCVKGPUDescriptorSetHub(_gpuDevice));
|
||||
|
||||
_gpuDescriptorHub->link(_gpuDescriptorSetHub);
|
||||
|
||||
|
||||
@@ -585,7 +585,7 @@ private:
|
||||
|
||||
vector<vector<VkDescriptorSet>> _fleaMarkets; // per back buffer
|
||||
|
||||
vector<VkDescriptorPoolSize> _poolSizes;
|
||||
vector<VkDescriptorPoolSize> _poolSizes;
|
||||
vector<VkDescriptorSetLayout> _setLayouts;
|
||||
uint _maxSetsPerPool = 0u;
|
||||
};
|
||||
@@ -786,6 +786,11 @@ public:
|
||||
CCVKGPUDescriptorSetHub(CCVKGPUDevice *device)
|
||||
: _device(device) {
|
||||
_setsToBeUpdated.resize(device->backBufferCount);
|
||||
if (device->minorVersion > 0) {
|
||||
_updateFn = vkUpdateDescriptorSetWithTemplate;
|
||||
} else {
|
||||
_updateFn = vkUpdateDescriptorSetWithTemplateKHR;
|
||||
}
|
||||
}
|
||||
|
||||
void record(const CCVKGPUDescriptorSet *gpuDescriptorSet) {
|
||||
@@ -817,22 +822,21 @@ public:
|
||||
|
||||
private:
|
||||
void update(const CCVKGPUDescriptorSet *gpuDescriptorSet) {
|
||||
const CCVKGPUDescriptorSet::DescriptorSetInstance &instance = gpuDescriptorSet->instances[_device->curBackBufferIndex];
|
||||
if (gpuDescriptorSet->pUpdateTemplate) {
|
||||
if (*gpuDescriptorSet->pUpdateTemplate) { // skip empty descriptor sets
|
||||
vkUpdateDescriptorSetWithTemplateKHR(_device->vkDevice,
|
||||
instance.vkDescriptorSet,
|
||||
*gpuDescriptorSet->pUpdateTemplate, instance.descriptorInfos.data());
|
||||
}
|
||||
const CCVKGPUDescriptorSet::Instance &instance = gpuDescriptorSet->instances[_device->curBackBufferIndex];
|
||||
if (gpuDescriptorSet->gpuLayout->vkDescriptorUpdateTemplate) {
|
||||
_updateFn(_device->vkDevice, instance.vkDescriptorSet,
|
||||
gpuDescriptorSet->gpuLayout->vkDescriptorUpdateTemplate, instance.descriptorInfos.data());
|
||||
} else {
|
||||
const vector<VkWriteDescriptorSet> &entries = instance.descriptorUpdateEntries;
|
||||
vkUpdateDescriptorSets(_device->vkDevice, entries.size(), entries.data(), 0, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
CCVKGPUDevice *_device = nullptr;
|
||||
using DescriptorSetList = unordered_set<const CCVKGPUDescriptorSet *>;
|
||||
vector<DescriptorSetList> _setsToBeUpdated;
|
||||
|
||||
CCVKGPUDevice * _device = nullptr;
|
||||
vector<DescriptorSetList> _setsToBeUpdated;
|
||||
PFN_vkUpdateDescriptorSetWithTemplate _updateFn = nullptr;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -974,17 +978,55 @@ private:
|
||||
template <typename T>
|
||||
struct DescriptorInfo {
|
||||
unordered_set<const CCVKGPUDescriptorSet *> sets;
|
||||
CachedArray<T *> descriptors;
|
||||
CachedArray<T *> descriptors;
|
||||
};
|
||||
|
||||
unordered_map<const VkDescriptorBufferInfo *, uint> _bufferInstaceIndices;
|
||||
unordered_map<const VkDescriptorBufferInfo *, uint> _bufferInstaceIndices;
|
||||
unordered_map<const CCVKGPUBufferView *, DescriptorInfo<VkDescriptorBufferInfo>> _buffers;
|
||||
unordered_map<const CCVKGPUTextureView *, DescriptorInfo<VkDescriptorImageInfo>> _textures;
|
||||
unordered_map<const CCVKGPUSampler *, CachedArray<VkDescriptorImageInfo *>> _samplers;
|
||||
unordered_map<const CCVKGPUSampler *, CachedArray<VkDescriptorImageInfo *>> _samplers;
|
||||
|
||||
CCVKGPUDescriptorSetHub *_descriptorSetHub = nullptr;
|
||||
};
|
||||
|
||||
class CCVKGPUBarrierManager final : public Object {
|
||||
public:
|
||||
CCVKGPUBarrierManager(CCVKGPUDevice *device)
|
||||
: _device(device) {}
|
||||
|
||||
void checkIn(CCVKGPUBuffer *gpuBuffer) {
|
||||
_buffersToBeChecked.insert(gpuBuffer);
|
||||
}
|
||||
|
||||
void checkIn(CCVKGPUBuffer *gpuBuffer, const ThsvsAccessType *newTypes, uint newTypeCount) {
|
||||
vector<ThsvsAccessType> &target = gpuBuffer->renderAccessTypes;
|
||||
for (uint i = 0u; i < newTypeCount; ++i) {
|
||||
if (std::find(target.begin(), target.end(), newTypes[i]) == target.end()) {
|
||||
target.push_back(newTypes[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void checkIn(CCVKGPUTexture *gpuTexture, const ThsvsAccessType *newTypes = nullptr, uint newTypeCount = 0) {
|
||||
vector<ThsvsAccessType> &target = gpuTexture->renderAccessTypes;
|
||||
for (uint i = 0u; i < newTypeCount; ++i) {
|
||||
if (std::find(target.begin(), target.end(), newTypes[i]) == target.end()) {
|
||||
target.push_back(newTypes[i]);
|
||||
}
|
||||
}
|
||||
_texturesToBeChecked.insert(gpuTexture);
|
||||
}
|
||||
|
||||
void update(CCVKGPUCommandBuffer *gpuCommandBuffer);
|
||||
|
||||
CC_INLINE bool needUpdate() { return !_texturesToBeChecked.empty() || !_buffersToBeChecked.empty(); }
|
||||
|
||||
private:
|
||||
unordered_set<CCVKGPUBuffer *> _buffersToBeChecked;
|
||||
unordered_set<CCVKGPUTexture *> _texturesToBeChecked;
|
||||
CCVKGPUDevice * _device = nullptr;
|
||||
};
|
||||
|
||||
/**
|
||||
* Manages buffer update events, across all back buffer instances.
|
||||
*/
|
||||
@@ -1143,7 +1185,7 @@ public:
|
||||
void link(CCVKGPUQueue *queue) {
|
||||
_queue = queue;
|
||||
|
||||
_cmdBuff.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
|
||||
_cmdBuff.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
|
||||
_cmdBuff.queueFamilyIndex = _queue->queueFamilyIndex;
|
||||
|
||||
VkFenceCreateInfo createInfo{VK_STRUCTURE_TYPE_FENCE_CREATE_INFO};
|
||||
|
||||
Reference in New Issue
Block a user