Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

subresource move #157

Merged
merged 14 commits into from
Aug 9, 2023
Merged

subresource move #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
49d64aa
name fix
Jul 28, 2023
a7999ce
remove ds input test code in metal
hana-alice Jul 31, 2023
d6f69c8
compute view subresname collect
hana-alice Jul 31, 2023
b3f0946
subres full name now
hana-alice Jul 31, 2023
06d1fbc
clang-tidy
hana-alice Jul 31, 2023
42d297e
move subres
Jul 31, 2023
3ef6e3f
Merge branch 'v3.8.1-pipeline' of github.com:hana-alice/engine into v…
Jul 31, 2023
760c6a7
subres move
hana-alice Aug 1, 2023
cf39951
subres offset
hana-alice Aug 2, 2023
c892c38
subres move
hana-alice Aug 3, 2023
5411409
Merge branch 'v3.8.1-pipeline' of github.com:star-e/cocos-engine into…
hana-alice Aug 3, 2023
8cafa6b
rename subresource
hana-alice Aug 3, 2023
979f300
clang tidy
hana-alice Aug 9, 2023
d02edf4
Merge branch 'v3.8.1-pipeline' of github.com:star-e/cocos-engine into…
hana-alice Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions native/cocos/renderer/frame-graph/ImmutableState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ std::pair<gfx::GFXObject*, gfx::GFXObject*> getBarrier(const ResourceBarrier& ba
info.type = barrierInfo.barrierType;
info.prevAccesses = getAccessFlags(usage, barrierInfo.beginStatus);
info.nextAccesses = getAccessFlags(usage, barrierInfo.endStatus);
info.baseMipLevel = static_cast<uint32_t>(barrierInfo.mipRange.base);
info.levelCount = static_cast<uint32_t>(barrierInfo.mipRange.len);
info.baseSlice = static_cast<uint32_t>(barrierInfo.layerRange.base);
info.sliceCount = static_cast<uint32_t>(barrierInfo.layerRange.len);
info.range.mipLevel = static_cast<uint32_t>(barrierInfo.mipRange.base);
info.range.levelCount = static_cast<uint32_t>(barrierInfo.mipRange.len);
info.range.firstSlice = static_cast<uint32_t>(barrierInfo.layerRange.base);
info.range.numSlices = static_cast<uint32_t>(barrierInfo.layerRange.len);

res.first = gfx::Device::getInstance()->getTextureBarrier(info);
res.second = gfxTexture;
Expand Down
18 changes: 13 additions & 5 deletions native/cocos/renderer/gfx-base/GFXDef-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,6 +1343,18 @@ struct RenderPassInfo {
EXPOSE_COPY_FN(RenderPassInfo)
};

struct ResourceRange {
uint32_t width{0};
uint32_t height{0};
uint32_t depthOrArraySize{0};
uint32_t firstSlice{0};
uint32_t numSlices{0};
uint32_t mipLevel{0};
uint32_t levelCount{0};
uint32_t basePlane{0};
uint32_t planeCount{0};
};

struct ALIGNAS(8) GeneralBarrierInfo {
AccessFlags prevAccesses{AccessFlagBit::NONE};
AccessFlags nextAccesses{AccessFlagBit::NONE};
Expand All @@ -1360,11 +1372,7 @@ struct ALIGNAS(8) TextureBarrierInfo {

BarrierType type{BarrierType::FULL};

uint32_t baseMipLevel{0};
uint32_t levelCount{1};
uint32_t baseSlice{0};
uint32_t sliceCount{1};

ResourceRange range{};
uint64_t discardContents{0}; // @ts-boolean

Queue *srcQueue{nullptr}; // @ts-nullable
Expand Down
8 changes: 4 additions & 4 deletions native/cocos/renderer/gfx-vulkan/states/VKTextureBarrier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ CCVKTextureBarrier::CCVKTextureBarrier(const TextureBarrierInfo &info) : Texture
_gpuBarrier->barrier.prevLayout = getAccessLayout(info.prevAccesses);
_gpuBarrier->barrier.nextLayout = getAccessLayout(info.nextAccesses);
_gpuBarrier->barrier.discardContents = !!info.discardContents;
_gpuBarrier->barrier.subresourceRange.baseMipLevel = 0U;
_gpuBarrier->barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
_gpuBarrier->barrier.subresourceRange.baseArrayLayer = 0U;
_gpuBarrier->barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
_gpuBarrier->barrier.subresourceRange.baseMipLevel = info.range.mipLevel;
_gpuBarrier->barrier.subresourceRange.levelCount = info.range.levelCount;
_gpuBarrier->barrier.subresourceRange.baseArrayLayer = info.range.firstSlice;
_gpuBarrier->barrier.subresourceRange.layerCount = info.range.numSlices;
_gpuBarrier->barrier.srcQueueFamilyIndex = info.srcQueue
? static_cast<CCVKQueue *>(info.srcQueue)->gpuQueue()->queueFamilyIndex
: VK_QUEUE_FAMILY_IGNORED;
Expand Down
Loading
Loading