base should not depend on se (#3359)

* base should not depend on se

* formatting
This commit is contained in:
Yun Hsiao Wu
2021-03-30 09:43:25 +08:00
committed by GitHub
parent 14561d91f6
commit f4fd7a2496
11 changed files with 96 additions and 114 deletions
+2 -2
View File
@@ -940,7 +940,7 @@ if(CC_USE_METAL)
cocos/renderer/gfx-metal/MTLCommandBuffer.mm
cocos/renderer/gfx-metal/MTLContext.h
NO_WERROR cocos/renderer/gfx-metal/MTLContext.mm # CAMetalLayer bug for apple
cocos/renderer/gfx-metal/MTLDevice.h
cocos/renderer/gfx-metal/MTLDevice.h
NO_WERROR cocos/renderer/gfx-metal/MTLDevice.mm # CAMetalLayer bug for apple
cocos/renderer/gfx-metal/MTLFramebuffer.mm
cocos/renderer/gfx-metal/MTLFramebuffer.h
@@ -1638,7 +1638,7 @@ cocos_source_files(
extensions/ExtensionMacros.h
)
list(APPEND COCOS2D_SOURCE_LIST ${CC_EXTERNAL_SROUCES})
list(APPEND COCOS2D_SOURCE_LIST ${CC_EXTERNAL_SOURCES})
add_library(cocos2d ${COCOS2D_SOURCE_LIST})
-6
View File
@@ -39,8 +39,6 @@
#define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
#include "boost/stacktrace.hpp"
#include "bindings/jswrapper/SeApi.h"
namespace cc {
namespace utils {
@@ -78,10 +76,6 @@ std::string getStacktrace(uint skip, uint maxDepth) {
return boost::stacktrace::to_string(boost::stacktrace::stacktrace(skip, maxDepth));
}
std::string getStacktraceJS() {
return se::ScriptEngine::getInstance()->getCurrentStackTrace();
}
} // namespace utils
} // namespace cc
-1
View File
@@ -56,7 +56,6 @@ Examples:
namespace utils {
CC_DLL std::string getStacktrace(uint skip = 0, uint maxDepth = UINT_MAX);
CC_DLL std::string getStacktraceJS();
CC_DLL int nextPOT(int x);
/** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof.
@@ -25,8 +25,20 @@
#include "ValidationUtils.h"
#include "bindings/jswrapper/SeApi.h"
namespace cc {
namespace utils {
String getStacktraceJS() {
return se::ScriptEngine::getInstance()->getCurrentStackTrace();
}
} // namespace utils
namespace gfx {
} // namespace gfx
} // namespace cc
@@ -29,6 +29,11 @@
#include "base/Utils.h"
namespace cc {
namespace utils {
String getStacktraceJS();
} // namespace utils
namespace gfx {
class GFXObject;
@@ -138,7 +138,6 @@ void CCVKCmdFuncCreateTexture(CCVKDevice *device, CCVKGPUTexture *gpuTexture) {
//CC_LOG_DEBUG("Allocated texture: %llu %llx %llx %llu %x", res.size, gpuTexture->vkImage, res.deviceMemory, res.offset, res.pMappedData);
gpuTexture->aspectMask = MapVkImageAspectFlags(gpuTexture->format);
gpuTexture->layoutRule = gpuTexture->usage & TextureUsage::STORAGE ? THSVS_IMAGE_LAYOUT_GENERAL : THSVS_IMAGE_LAYOUT_OPTIMAL; // as per vulkan spec
}
void CCVKCmdFuncCreateTextureView(CCVKDevice *device, CCVKGPUTextureView *gpuTextureView) {
@@ -217,7 +216,7 @@ void CCVKCmdFuncCreateBuffer(CCVKDevice *device, CCVKGPUBuffer *gpuBuffer) {
VK_CHECK(vmaCreateBuffer(device->gpuDevice()->memoryAllocator, &bufferInfo, &allocInfo, &gpuBuffer->vkBuffer, &gpuBuffer->vmaAllocation, &res));
//CC_LOG_DEBUG("Allocated buffer: %llu, %llx %llx %llu %x", res.size, gpuBuffer->vkBuffer, res.deviceMemory, res.offset, res.pMappedData);
gpuBuffer->mappedData = (uint8_t *)res.pMappedData;
gpuBuffer->mappedData = reinterpret_cast<uint8_t *>(res.pMappedData);
gpuBuffer->startOffset = 0; // we are creating one VkBuffer each for now
// add special access types directly from usage
@@ -422,8 +421,8 @@ void CCVKCmdFuncCreateFramebuffer(CCVKDevice *device, CCVKGPUFramebuffer *gpuFra
gpuFramebuffer->swapchain = device->gpuSwapchain();
FramebufferListMap & fboListMap = gpuFramebuffer->swapchain->vkSwapchainFramebufferListMap;
FramebufferListMapIter fboListMapIter = fboListMap.find(gpuFramebuffer);
if (fboListMapIter != fboListMap.end() && fboListMapIter->second.size()) {
auto fboListMapIter = fboListMap.find(gpuFramebuffer);
if (fboListMapIter != fboListMap.end() && !fboListMapIter->second.empty()) {
return;
}
size_t swapchainImageCount = gpuFramebuffer->swapchain->vkSwapchainImageViews.size();
@@ -755,7 +754,7 @@ void CCVKCmdFuncUpdateBuffer(CCVKDevice *device, CCVKGPUBuffer *gpuBuffer, const
if (gpuBuffer->usage & BufferUsageBit::INDIRECT) {
size_t drawInfoCount = size / sizeof(DrawInfo);
const DrawInfo *drawInfo = static_cast<const DrawInfo *>(buffer);
const auto *drawInfo = static_cast<const DrawInfo *>(buffer);
if (drawInfoCount > 0) {
if (drawInfo->indexCount) {
for (size_t i = 0; i < drawInfoCount; ++i) {
@@ -970,10 +969,10 @@ void CCVKCmdFuncDestroyFramebuffer(CCVKGPUDevice *gpuDevice, CCVKGPUFramebuffer
}
} else {
FramebufferListMap & fboListMap = gpuFramebuffer->swapchain->vkSwapchainFramebufferListMap;
FramebufferListMapIter fboListMapIter = fboListMap.find(gpuFramebuffer);
auto fboListMapIter = fboListMap.find(gpuFramebuffer);
if (fboListMapIter != fboListMap.end()) {
for (size_t i = 0u; i < fboListMapIter->second.size(); ++i) {
vkDestroyFramebuffer(gpuDevice->vkDevice, fboListMapIter->second[i], nullptr);
for (auto & i : fboListMapIter->second) {
vkDestroyFramebuffer(gpuDevice->vkDevice, i, nullptr);
}
fboListMapIter->second.clear();
fboListMap.erase(fboListMapIter);
@@ -1016,18 +1015,6 @@ void CCVKCmdFuncDestroyPipelineState(CCVKGPUDevice *gpuDevice, CCVKGPUPipelineSt
}
}
void CCVKCmdFuncGlobalMemoryBarrier(const CCVKGPUCommandBuffer *gpuCommandBuffer, const ThsvsGlobalBarrier &globalBarrier) {
VkPipelineStageFlags srcStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
VkPipelineStageFlags tempSrcStageMask = 0;
VkPipelineStageFlags tempDstStageMask = 0;
VkMemoryBarrier vkBarrier;
thsvsGetVulkanMemoryBarrier(globalBarrier, &tempSrcStageMask, &tempDstStageMask, &vkBarrier);
srcStageMask |= tempSrcStageMask;
dstStageMask |= tempDstStageMask;
vkCmdPipelineBarrier(gpuCommandBuffer->vkCommandBuffer, srcStageMask, dstStageMask, 0, 1, &vkBarrier, 0, nullptr, 0, nullptr);
}
void CCVKCmdFuncImageMemoryBarrier(const CCVKGPUCommandBuffer *gpuCommandBuffer, const ThsvsImageBarrier &imageBarrier) {
VkPipelineStageFlags srcStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
VkPipelineStageFlags dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
@@ -1144,7 +1131,7 @@ void CCVKGPUBarrierManager::update(CCVKGPUTransportHub *transportHub) {
VkMemoryBarrier vkBarrier;
VkMemoryBarrier *pVkBarrier = nullptr;
if (prevAccesses.size()) {
if (!prevAccesses.empty()) {
ThsvsGlobalBarrier globalBarrier{};
globalBarrier.prevAccessCount = prevAccesses.size();
globalBarrier.pPrevAccesses = prevAccesses.data();
@@ -1192,7 +1179,7 @@ void CCVKGPUBarrierManager::update(CCVKGPUTransportHub *transportHub) {
gpuTexture->transferAccess = THSVS_ACCESS_NONE;
}
if (pVkBarrier || vkImageBarriers.size()) {
if (pVkBarrier || !vkImageBarriers.empty()) {
transportHub->checkIn([&](CCVKGPUCommandBuffer *gpuCommandBuffer) {
vkCmdPipelineBarrier(gpuCommandBuffer->vkCommandBuffer, srcStageMask, dstStageMask, 0,
pVkBarrier ? 1 : 0, pVkBarrier, 0, nullptr, vkImageBarriers.size(), vkImageBarriers.data());
@@ -212,7 +212,6 @@ void CCVKDescriptorSet::update() {
if (bufferView) {
descriptorHub->connect(_gpuDescriptorSet, bufferView, &descriptorInfo.buffer, t);
descriptorHub->update(bufferView, &descriptorInfo.buffer);
//layoutMgr->checkIn(bufferView->gpuBuffer, binding.accessTypes.data(), binding.accessTypes.size());
}
}
binding.gpuBufferView = bufferView;
+65 -78
View File
@@ -25,6 +25,8 @@
#pragma once
#include <utility>
#include "VKUtils.h"
#define TBB_USE_EXCEPTIONS 0 // no-rtti for now
@@ -92,8 +94,6 @@ public:
SampleCount samples = SampleCount::X1;
TextureFlags flags = TextureFlagBit::NONE;
VkImageAspectFlags aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
ThsvsImageLayout layoutRule = THSVS_IMAGE_LAYOUT_OPTIMAL;
bool isPowerOf2 = false;
VkImage vkImage = VK_NULL_HANDLE;
VmaAllocation vmaAllocation = VK_NULL_HANDLE;
@@ -101,7 +101,7 @@ public:
vector<ThsvsAccessType> currentAccessTypes;
// for barrier manager
vector<ThsvsAccessType> renderAccessTypes; // gathered from desriptor sets
vector<ThsvsAccessType> renderAccessTypes; // gathered from descriptor sets
ThsvsAccessType transferAccess = THSVS_ACCESS_NONE;
};
@@ -118,7 +118,7 @@ public:
// descriptor infos
VkImageView vkImageView = VK_NULL_HANDLE;
};
typedef vector<CCVKGPUTextureView *> CCVKGPUTextureViewList;
using CCVKGPUTextureViewList = vector<CCVKGPUTextureView *>;
class CCVKGPUSampler final : public Object {
public:
@@ -131,8 +131,6 @@ public:
uint maxAnisotropy = 0u;
ComparisonFunc cmpFunc = ComparisonFunc::NEVER;
Color borderColor;
uint minLOD = 0u;
uint maxLOD = 1000u;
float mipLODBias = 0.0f;
// descriptor infos
@@ -165,7 +163,7 @@ public:
vector<ThsvsAccessType> renderAccessTypes; // gathered from descriptor sets
ThsvsAccessType transferAccess = THSVS_ACCESS_NONE;
};
typedef vector<CCVKGPUBuffer *> CCVKGPUBufferList;
using CCVKGPUBufferList = vector<CCVKGPUBuffer *>;
class CCVKGPUBufferView final : public Object {
public:
@@ -185,9 +183,9 @@ public:
bool isOffscreen = true;
};
typedef vector<VkFramebuffer> FramebufferList;
typedef unordered_map<CCVKGPUFramebuffer *, FramebufferList> FramebufferListMap;
typedef FramebufferListMap::iterator FramebufferListMapIter;
using FramebufferList = vector<VkFramebuffer>;
using FramebufferListMap = unordered_map<CCVKGPUFramebuffer *, FramebufferList>;
using FramebufferListMapIter = FramebufferListMap::iterator;
class CCVKGPUSwapchain final : public Object {
public:
@@ -226,13 +224,13 @@ public:
struct CCVKGPUShaderStage {
CCVKGPUShaderStage(ShaderStageFlagBit t, String s)
: type(t),
source(s) {
source(std::move(s)) {
}
ShaderStageFlagBit type = ShaderStageFlagBit::NONE;
String source;
VkShaderModule vkShader = VK_NULL_HANDLE;
};
typedef vector<CCVKGPUShaderStage> CCVKGPUShaderStageList;
using CCVKGPUShaderStageList = vector<CCVKGPUShaderStage>;
class CCVKGPUShader final : public Object {
public:
@@ -265,7 +263,7 @@ struct CCVKGPUDescriptor {
CCVKGPUTextureView * gpuTextureView = nullptr;
CCVKGPUSampler * gpuSampler = nullptr;
};
typedef vector<CCVKGPUDescriptor> CCVKGPUDescriptorList;
using CCVKGPUDescriptorList = vector<CCVKGPUDescriptor>;
class CCVKGPUDescriptorSetLayout;
class CCVKGPUDescriptorSet final : public Object {
@@ -285,7 +283,7 @@ public:
uint layoutID = 0u;
};
typedef vector<CCVKGPUDescriptorSetLayout *> CCVKGPUDescriptorSetLayoutList;
using CCVKGPUDescriptorSetLayoutList = vector<CCVKGPUDescriptorSetLayout *>;
class CCVKGPUPipelineLayout final : public Object {
public:
@@ -382,7 +380,7 @@ private:
*/
class CCVKGPUFencePool final : public Object {
public:
CCVKGPUFencePool(CCVKGPUDevice *device)
explicit CCVKGPUFencePool(CCVKGPUDevice *device)
: _device(device) {
}
@@ -419,7 +417,7 @@ public:
return _fences.data();
}
uint size() {
uint size() const {
return _count;
}
@@ -434,7 +432,7 @@ private:
*/
class CCVKGPUSemaphorePool final : public Object {
public:
CCVKGPUSemaphorePool(CCVKGPUDevice *device)
explicit CCVKGPUSemaphorePool(CCVKGPUDevice *device)
: _device(device) {
}
@@ -464,7 +462,7 @@ public:
_count = 0;
}
uint size() {
uint size() const {
return _count;
}
@@ -505,23 +503,22 @@ public:
void link(CCVKGPUDevice *device, uint maxSetsPerPool, vector<VkDescriptorSetLayoutBinding> &bindings, VkDescriptorSetLayout setLayout) {
_device = device;
_maxSetsPerPool = maxSetsPerPool;
_setLayouts.insert(_setLayouts.begin(), _maxSetsPerPool, setLayout);
_setLayouts.insert(_setLayouts.cbegin(), _maxSetsPerPool, setLayout);
_fleaMarkets.resize(device->backBufferCount);
unordered_map<VkDescriptorType, uint> typeMap;
for (size_t i = 0u; i < bindings.size(); ++i) {
VkDescriptorSetLayoutBinding &vkBinding = bindings[i];
for (auto & vkBinding : bindings) {
typeMap[vkBinding.descriptorType] += maxSetsPerPool * vkBinding.descriptorCount;
}
// minimal reserve for empty set layouts
if (!bindings.size()) {
if (bindings.empty()) {
typeMap[VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER] = 1;
}
_poolSizes.clear();
for (unordered_map<VkDescriptorType, uint>::iterator it = typeMap.begin(); it != typeMap.end(); it++) {
_poolSizes.push_back({it->first, it->second});
for (auto & it : typeMap) {
_poolSizes.push_back({it.first, it.second});
}
}
@@ -537,7 +534,7 @@ public:
size_t size = _pools.size();
uint idx = 0u;
for (; idx < size; idx++) {
if (_pools[idx].freeSets.size()) {
if (!_pools[idx].freeSets.empty()) {
output = _pools[idx].freeSets.back();
_pools[idx].freeSets.pop_back();
_pools[idx].activeSets.insert(output);
@@ -548,10 +545,10 @@ public:
if (idx >= size) {
VkDescriptorPoolCreateInfo createInfo{VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO};
createInfo.maxSets = _maxSetsPerPool;
createInfo.poolSizeCount = _poolSizes.size();
createInfo.poolSizeCount = toUint(_poolSizes.size());
createInfo.pPoolSizes = _poolSizes.data();
VkDescriptorPool descriptorPool;
VkDescriptorPool descriptorPool = VK_NULL_HANDLE;
VK_CHECK(vkCreateDescriptorPool(_device->vkDevice, &createInfo, nullptr, &descriptorPool));
_pools.push_back({descriptorPool});
@@ -617,17 +614,17 @@ public:
};
/**
* Command buffer pool based on VkCommandPools, always try to resue previous allocations first.
* Command buffer pool based on VkCommandPools, always try to reuse previous allocations first.
*/
class CCVKGPUCommandBufferPool final : public Object {
public:
CCVKGPUCommandBufferPool(CCVKGPUDevice *device)
explicit CCVKGPUCommandBufferPool(CCVKGPUDevice *device)
: _device(device) {
}
~CCVKGPUCommandBufferPool() {
for (unordered_map<uint, CommandBufferPool>::iterator it = _pools.begin(); it != _pools.end(); it++) {
CommandBufferPool &pool = it->second;
for (auto & it : _pools) {
CommandBufferPool &pool = it.second;
if (pool.vkCommandPool != VK_NULL_HANDLE) {
vkDestroyCommandPool(_device->vkDevice, pool.vkCommandPool, nullptr);
pool.vkCommandPool = VK_NULL_HANDLE;
@@ -685,9 +682,9 @@ public:
}
void reset() {
for (unordered_map<uint, CommandBufferPool>::iterator it = _pools.begin(); it != _pools.end(); it++) {
if (getBackBufferIndex(it->first) != _device->curBackBufferIndex) continue;
CommandBufferPool &pool = it->second;
for (auto & it : _pools) {
if (getBackBufferIndex(it.first) != _device->curBackBufferIndex) { continue; }
CommandBufferPool &pool = it.second;
bool needsReset = false;
for (uint i = 0u; i < 2u; ++i) {
@@ -720,10 +717,10 @@ private:
/**
* Staging buffer pool, based on multiple fix-sized VkBuffer blocks.
*/
constexpr size_t chunkSize = 32 * 1024 * 1024; // 32M per block by default
constexpr size_t CHUNK_SIZE = 32 * 1024 * 1024; // 32M per block by default
class CCVKGPUStagingBufferPool final : public Object {
public:
CCVKGPUStagingBufferPool(CCVKGPUDevice *device)
explicit CCVKGPUStagingBufferPool(CCVKGPUDevice *device)
: _device(device) {
}
@@ -742,7 +739,7 @@ public:
for (size_t idx = 0u; idx < bufferCount; idx++) {
Buffer *cur = &_pool[idx];
offset = roundUp(cur->curOffset, alignment);
if (chunkSize - offset >= gpuBuffer->size) {
if (CHUNK_SIZE - offset >= gpuBuffer->size) {
buffer = cur;
break;
}
@@ -751,14 +748,14 @@ public:
_pool.resize(bufferCount + 1);
buffer = &_pool.back();
VkBufferCreateInfo bufferInfo{VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO};
bufferInfo.size = chunkSize;
bufferInfo.size = CHUNK_SIZE;
bufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
VmaAllocationCreateInfo allocInfo{};
allocInfo.flags = VMA_ALLOCATION_CREATE_MAPPED_BIT;
allocInfo.usage = VMA_MEMORY_USAGE_CPU_ONLY;
VmaAllocationInfo res;
VK_CHECK(vmaCreateBuffer(_device->memoryAllocator, &bufferInfo, &allocInfo, &buffer->vkBuffer, &buffer->vmaAllocation, &res));
buffer->mappedData = (uint8_t *)res.pMappedData;
buffer->mappedData = reinterpret_cast<uint8_t *>(res.pMappedData);
offset = 0u;
}
gpuBuffer->vkBuffer = buffer->vkBuffer;
@@ -791,7 +788,7 @@ private:
*/
class CCVKGPUDescriptorSetHub final : public Object {
public:
CCVKGPUDescriptorSetHub(CCVKGPUDevice *device)
explicit CCVKGPUDescriptorSetHub(CCVKGPUDevice *device)
: _device(device) {
_setsToBeUpdated.resize(device->backBufferCount);
if (device->minorVersion > 0) {
@@ -822,8 +819,8 @@ public:
void flush() {
DescriptorSetList &sets = _setsToBeUpdated[_device->curBackBufferIndex];
for (DescriptorSetList::iterator it = sets.begin(); it != sets.end(); ++it) {
update(*it);
for (const auto *set : sets) {
update(set);
}
sets.clear();
}
@@ -836,7 +833,7 @@ private:
gpuDescriptorSet->gpuLayout->vkDescriptorUpdateTemplate, instance.descriptorInfos.data());
} else {
const vector<VkWriteDescriptorSet> &entries = instance.descriptorUpdateEntries;
vkUpdateDescriptorSets(_device->vkDevice, entries.size(), entries.data(), 0, nullptr);
vkUpdateDescriptorSets(_device->vkDevice, toUint(entries.size()), entries.data(), 0, nullptr);
}
}
@@ -853,7 +850,7 @@ private:
*/
class CCVKGPUDescriptorHub final : public Object {
public:
CCVKGPUDescriptorHub(CCVKGPUDevice *device) {
explicit CCVKGPUDescriptorHub(CCVKGPUDevice * /*device*/) {
}
void link(CCVKGPUDescriptorSetHub *descriptorSetHub) {
@@ -863,7 +860,7 @@ public:
void connect(const CCVKGPUDescriptorSet *set, const CCVKGPUBufferView *buffer, VkDescriptorBufferInfo *descriptor, uint instanceIdx) {
_buffers[buffer].sets.insert(set);
_buffers[buffer].descriptors.push(descriptor);
_bufferInstaceIndices[descriptor] = instanceIdx;
_bufferInstanceIndices[descriptor] = instanceIdx;
}
void connect(const CCVKGPUDescriptorSet *set, const CCVKGPUTextureView *texture, VkDescriptorImageInfo *descriptor) {
_textures[texture].sets.insert(set);
@@ -878,9 +875,9 @@ public:
if (it == _buffers.end()) return;
auto &info = it->second;
for (uint i = 0u; i < info.descriptors.size(); i++) {
_doUpdate(buffer, info.descriptors[i]);
doUpdate(buffer, info.descriptors[i]);
}
for (auto set : info.sets) {
for (const auto *set : info.sets) {
_descriptorSetHub->record(set);
}
}
@@ -890,7 +887,7 @@ public:
auto &descriptors = it->second.descriptors;
for (uint i = 0u; i < descriptors.size(); i++) {
if (descriptors[i] == descriptor) {
_doUpdate(buffer, descriptor);
doUpdate(buffer, descriptor);
break;
}
}
@@ -900,9 +897,9 @@ public:
if (it == _textures.end()) return;
auto &info = it->second;
for (uint i = 0u; i < info.descriptors.size(); i++) {
_doUpdate(texture, info.descriptors[i]);
doUpdate(texture, info.descriptors[i]);
}
for (auto set : info.sets) {
for (const auto *set : info.sets) {
_descriptorSetHub->record(set);
}
}
@@ -912,7 +909,7 @@ public:
auto &descriptors = it->second.descriptors;
for (uint i = 0u; i < descriptors.size(); i++) {
if (descriptors[i] == descriptor) {
_doUpdate(texture, descriptor);
doUpdate(texture, descriptor);
break;
}
}
@@ -923,7 +920,7 @@ public:
auto &descriptors = it->second;
for (uint i = 0u; i < descriptors.size(); ++i) {
if (descriptors[i] == descriptor) {
_doUpdate(sampler, descriptor);
doUpdate(sampler, descriptor);
break;
}
}
@@ -933,7 +930,7 @@ public:
auto it = _buffers.find(buffer);
if (it == _buffers.end()) return;
for (uint i = 0; i < it->second.descriptors.size(); ++i) {
_bufferInstaceIndices.erase(it->second.descriptors[i]);
_bufferInstanceIndices.erase(it->second.descriptors[i]);
}
_buffers.erase(it);
}
@@ -942,7 +939,7 @@ public:
if (it == _buffers.end()) return;
auto &descriptors = it->second.descriptors;
descriptors.fastRemove(descriptors.indexOf(descriptor));
_bufferInstaceIndices.erase(descriptor);
_bufferInstanceIndices.erase(descriptor);
}
void disengage(const CCVKGPUTextureView *texture) {
auto it = _textures.find(texture);
@@ -968,18 +965,18 @@ public:
}
private:
void _doUpdate(const CCVKGPUBufferView *buffer, VkDescriptorBufferInfo *descriptor) {
VkDeviceSize instanceOffset = _bufferInstaceIndices[descriptor] * buffer->gpuBuffer->instanceSize;
void doUpdate(const CCVKGPUBufferView *buffer, VkDescriptorBufferInfo *descriptor) {
VkDeviceSize instanceOffset = _bufferInstanceIndices[descriptor] * buffer->gpuBuffer->instanceSize;
descriptor->buffer = buffer->gpuBuffer->vkBuffer;
descriptor->offset = buffer->gpuBuffer->startOffset + instanceOffset + buffer->offset;
descriptor->range = buffer->range;
}
void _doUpdate(const CCVKGPUTextureView *texture, VkDescriptorImageInfo *descriptor) {
void doUpdate(const CCVKGPUTextureView *texture, VkDescriptorImageInfo *descriptor) {
descriptor->imageView = texture->vkImageView;
}
void _doUpdate(const CCVKGPUSampler *sampler, VkDescriptorImageInfo *descriptor) {
void doUpdate(const CCVKGPUSampler *sampler, VkDescriptorImageInfo *descriptor) {
descriptor->sampler = sampler->vkSampler;
}
@@ -989,7 +986,7 @@ private:
CachedArray<T *> descriptors;
};
unordered_map<const VkDescriptorBufferInfo *, uint> _bufferInstaceIndices;
unordered_map<const VkDescriptorBufferInfo *, uint> _bufferInstanceIndices;
unordered_map<const CCVKGPUBufferView *, DescriptorInfo<VkDescriptorBufferInfo>> _buffers;
unordered_map<const CCVKGPUTextureView *, DescriptorInfo<VkDescriptorImageInfo>> _textures;
unordered_map<const CCVKGPUSampler *, CachedArray<VkDescriptorImageInfo *>> _samplers;
@@ -1003,7 +1000,7 @@ private:
*/
class CCVKGPURecycleBin final : public Object {
public:
CCVKGPURecycleBin(CCVKGPUDevice *device)
explicit CCVKGPURecycleBin(CCVKGPUDevice *device)
: _device(device) {
_resources.resize(16);
}
@@ -1054,7 +1051,6 @@ private:
};
struct Resource {
RecycledType type = RecycledType::UNKNOWN;
bool isView = false;
union {
// resizable resources, cannot take over directly
// or descriptor sets won't work
@@ -1110,7 +1106,7 @@ public:
VK_CHECK(vkCreateFence(_device->vkDevice, &createInfo, nullptr, &_fence));
}
bool empty() {
bool empty() const {
return !_cmdBuff.vkCommandBuffer;
}
@@ -1159,22 +1155,13 @@ private:
class CCVKGPUBarrierManager final : public Object {
public:
CCVKGPUBarrierManager(CCVKGPUDevice *device)
explicit 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) {
@@ -1201,7 +1188,7 @@ private:
*/
class CCVKGPUBufferHub final : public Object {
public:
CCVKGPUBufferHub(CCVKGPUDevice *device)
explicit CCVKGPUBufferHub(CCVKGPUDevice *device)
: _device(device) {
_buffersToBeUpdated.resize(device->backBufferCount);
}
@@ -1231,11 +1218,11 @@ public:
auto &buffers = _buffersToBeUpdated[_device->curBackBufferIndex];
transportHub->checkIn([&](const CCVKGPUCommandBuffer *gpuCommandBuffer) {
VkBufferCopy region;
for (auto it = buffers.begin(); it != buffers.end(); ++it) {
region.srcOffset = it->first->startOffset + it->second.srcIndex * it->first->instanceSize;
region.dstOffset = it->first->startOffset + _device->curBackBufferIndex * it->first->instanceSize;
region.size = it->second.size;
vkCmdCopyBuffer(gpuCommandBuffer->vkCommandBuffer, it->first->vkBuffer, it->first->vkBuffer, 1, &region);
for (auto & buffer : buffers) {
region.srcOffset = buffer.first->startOffset + buffer.second.srcIndex * buffer.first->instanceSize;
region.dstOffset = buffer.first->startOffset + _device->curBackBufferIndex * buffer.first->instanceSize;
region.size = buffer.second.size;
vkCmdCopyBuffer(gpuCommandBuffer->vkCommandBuffer, buffer.first->vkBuffer, buffer.first->vkBuffer, 1, &region);
}
});
buffers.clear();
+1 -1
View File
@@ -48,7 +48,7 @@
VkResult err = x; \
if (err) { \
CC_LOG_ERROR("%s returned Vulkan error: %d", #x, err); \
CCASSERT(0, "Vulkan Error"); \
CCASSERT(false, "Vulkan Error"); \
} \
} while (0)
@@ -54,7 +54,6 @@ void CCVKTexture::doInit(const TextureInfo &info) {
_gpuTexture->mipLevels = _levelCount;
_gpuTexture->samples = _samples;
_gpuTexture->flags = _flags;
_gpuTexture->isPowerOf2 = math::IsPowerOfTwo(_width) && math::IsPowerOfTwo(_height);
CCVKCmdFuncCreateTexture(CCVKDevice::getInstance(), _gpuTexture);
+2 -2
View File
@@ -1,9 +1,9 @@
{
"version": "v3d-gfx-37",
"version": "v3d-gfx-39",
"from": {
"type": "github",
"owner": "cocos-creator",
"name": "engine-native-external",
"checkout": "v3d-gfx-37"
"checkout": "v3d-gfx-39"
}
}