swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 06:08:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Chore] (MG_Backend/DirectVulkan): rename functions in VkTextureManager

Browse Source
This commit is contained in:
swung0x48
2026-02-25 09:52:15 +08:00
parent a757669df5
commit 59bad77176
2 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_Backend/DirectVulkan/Renderer/VkTextureManager.cpp
+29 -26
View File
@@ -40,7 +40,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
m_graphicsQueue = VK_NULL_HANDLE; m_graphicsQueue = VK_NULL_HANDLE;
} }
Bool VkTextureManager::SyncTextureAndGetDescriptor(const MG_State::GLState::ITextureObject& texture, Bool VkTextureManager::SyncTextureAndGetDescriptor(MG_State::GLState::ITextureObject& texture,
VkDescriptorImageInfo& outImageInfo) { VkDescriptorImageInfo& outImageInfo) {
MOBILEGL_ASSERT(m_device != VK_NULL_HANDLE, "SyncTextureAndGetDescriptor: m_device == VK_NULL_HANDLE"); MOBILEGL_ASSERT(m_device != VK_NULL_HANDLE, "SyncTextureAndGetDescriptor: m_device == VK_NULL_HANDLE");
@@ -52,7 +52,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
it = insertIt; it = insertIt;
} }
if (!EnsureTextureSynced(it->second, texture)) { if (!SyncTexture(texture, it->second)) {
return false; return false;
} }
@@ -66,19 +66,20 @@ namespace MobileGL::MG_Backend::DirectVulkan {
return true; return true;
} }
Bool VkTextureManager::EnsureTextureSynced(TextureResource& resource, const MG_State::GLState::ITextureObject& texture) { Bool VkTextureManager::SyncTexture(MG_State::GLState::ITextureObject &texture,
TextureResource &outResource) {
TextureUploadTarget level0Target = TextureUploadTarget::Unknown; TextureUploadTarget level0Target = TextureUploadTarget::Unknown;
IntVec3 texelSize{0, 0, 0}; IntVec3 texelSize{0, 0, 0};
SizeT byteSize = 0; SizeT byteSize = 0;
if (!ResolveLevel0(texture, level0Target, texelSize, byteSize)) { if (!CheckLevel0Completeness(texture, level0Target, texelSize, byteSize)) {
return false; return false;
} }
if (!EnsureTextureResource(resource, texture, level0Target, texelSize, byteSize)) { if (!SyncTextureResource(texture, level0Target, texelSize, byteSize, outResource)) {
return false; return false;
} }
const auto* mipTexture = dynamic_cast<const MG_State::GLState::TextureObjectMipmap*>(&texture); auto* mipTexture = dynamic_cast<MG_State::GLState::TextureObjectMipmap*>(&texture);
if (!mipTexture) { if (!mipTexture) {
return false; return false;
} }
@@ -87,19 +88,20 @@ namespace MobileGL::MG_Backend::DirectVulkan {
return true; return true;
} }
if (!UploadLevel0(resource, *mipTexture, level0Target, byteSize)) { if (!UploadLevel0(*mipTexture, level0Target, byteSize, outResource)) {
return false; return false;
} }
auto& mutableTexture = const_cast<MG_State::GLState::TextureObjectMipmap&>(*mipTexture); auto& mutableTexture = *mipTexture;
mutableTexture.MarkStorageDirty(level0Target, 0, false); mutableTexture.MarkStorageDirty(level0Target, 0, false);
return true; return true;
} }
Bool VkTextureManager::EnsureTextureResource(TextureResource& resource, const MG_State::GLState::ITextureObject& texture, Bool VkTextureManager::SyncTextureResource(const MG_State::GLState::ITextureObject &texture,
TextureUploadTarget level0Target, const IntVec3& texelSize, TextureUploadTarget level0Target,
SizeT byteSize) { const IntVec3 &texelSize, SizeT byteSize,
const VkFormat format = ResolveTextureFormat(texture.GetFormat()); TextureResource &resource) {
const VkFormat format = GetVkFormat(texture.GetFormat());
if (format == VK_FORMAT_UNDEFINED) { if (format == VK_FORMAT_UNDEFINED) {
return false; return false;
} }
@@ -158,10 +160,10 @@ namespace MobileGL::MG_Backend::DirectVulkan {
return true; return true;
} }
Bool VkTextureManager::UploadLevel0(TextureResource& resource, const MG_State::GLState::TextureObjectMipmap& mipmapTexture, Bool VkTextureManager::UploadLevel0(MG_State::GLState::TextureObjectMipmap &mipmapTexture,
TextureUploadTarget level0Target, SizeT byteSize) { TextureUploadTarget level0Target, SizeT byteSize,
auto& mutableTexture = const_cast<MG_State::GLState::TextureObjectMipmap&>(mipmapTexture); TextureResource &outResource) {
const void* source = mutableTexture.MapMipmapData(level0Target, 0); const void* source = mipmapTexture.MapMipmapData(level0Target, 0);
if (source == nullptr || byteSize == 0) { if (source == nullptr || byteSize == 0) {
return false; return false;
} }
@@ -186,16 +188,17 @@ namespace MobileGL::MG_Backend::DirectVulkan {
std::memcpy(mapped, source, byteSize); std::memcpy(mapped, source, byteSize);
vmaUnmapMemory(m_allocator, stagingAllocation); vmaUnmapMemory(m_allocator, stagingAllocation);
const Bool ok = ExecuteImmediate([&](VkCommandBuffer commandBuffer) { // Could be uploaded asynchronously?
const Bool ok = ExecuteCmdBufImmediate([&](VkCommandBuffer commandBuffer) {
VkImageMemoryBarrier toTransferDst{}; VkImageMemoryBarrier toTransferDst{};
toTransferDst.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; toTransferDst.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
toTransferDst.srcAccessMask = 0; toTransferDst.srcAccessMask = 0;
toTransferDst.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; toTransferDst.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
toTransferDst.oldLayout = resource.layout; toTransferDst.oldLayout = outResource.layout;
toTransferDst.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; toTransferDst.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
toTransferDst.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; toTransferDst.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
toTransferDst.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; toTransferDst.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
toTransferDst.image = resource.image; toTransferDst.image = outResource.image;
toTransferDst.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; toTransferDst.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
toTransferDst.subresourceRange.baseMipLevel = 0; toTransferDst.subresourceRange.baseMipLevel = 0;
toTransferDst.subresourceRange.levelCount = 1; toTransferDst.subresourceRange.levelCount = 1;
@@ -213,8 +216,8 @@ namespace MobileGL::MG_Backend::DirectVulkan {
copy.imageSubresource.baseArrayLayer = 0; copy.imageSubresource.baseArrayLayer = 0;
copy.imageSubresource.layerCount = 1; copy.imageSubresource.layerCount = 1;
copy.imageOffset = {0, 0, 0}; copy.imageOffset = {0, 0, 0};
copy.imageExtent = {resource.extent.width, resource.extent.height, 1}; copy.imageExtent = {outResource.extent.width, outResource.extent.height, 1};
vkCmdCopyBufferToImage(commandBuffer, stagingBuffer, resource.image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, vkCmdCopyBufferToImage(commandBuffer, stagingBuffer, outResource.image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1,
&copy); &copy);
VkImageMemoryBarrier toSampled{}; VkImageMemoryBarrier toSampled{};
@@ -225,7 +228,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
toSampled.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; toSampled.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
toSampled.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; toSampled.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
toSampled.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; toSampled.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
toSampled.image = resource.image; toSampled.image = outResource.image;
toSampled.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; toSampled.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
toSampled.subresourceRange.baseMipLevel = 0; toSampled.subresourceRange.baseMipLevel = 0;
toSampled.subresourceRange.levelCount = 1; toSampled.subresourceRange.levelCount = 1;
@@ -240,11 +243,11 @@ namespace MobileGL::MG_Backend::DirectVulkan {
if (!ok) { if (!ok) {
return false; return false;
} }
resource.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; outResource.layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
return true; return true;
} }
Bool VkTextureManager::ExecuteImmediate(const std::function<void(VkCommandBuffer)>& recorder) const { Bool VkTextureManager::ExecuteCmdBufImmediate(const std::function<void(VkCommandBuffer)>& recorder) const {
VkCommandBufferAllocateInfo allocInfo{}; VkCommandBufferAllocateInfo allocInfo{};
allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
allocInfo.commandPool = m_commandPool; allocInfo.commandPool = m_commandPool;
@@ -289,7 +292,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
resource.format = VK_FORMAT_UNDEFINED; resource.format = VK_FORMAT_UNDEFINED;
} }
Bool VkTextureManager::ResolveLevel0(const MG_State::GLState::ITextureObject& texture, TextureUploadTarget& outTarget, Bool VkTextureManager::CheckLevel0Completeness(const MG_State::GLState::ITextureObject& texture, TextureUploadTarget& outTarget,
IntVec3& outTexelSize, SizeT& outByteSize) { IntVec3& outTexelSize, SizeT& outByteSize) {
const auto* mipTexture = dynamic_cast<const MG_State::GLState::TextureObjectMipmap*>(&texture); const auto* mipTexture = dynamic_cast<const MG_State::GLState::TextureObjectMipmap*>(&texture);
if (!mipTexture) { if (!mipTexture) {
@@ -305,7 +308,7 @@ namespace MobileGL::MG_Backend::DirectVulkan {
return outTexelSize.x() > 0 && outTexelSize.y() > 0 && outByteSize > 0; return outTexelSize.x() > 0 && outTexelSize.y() > 0 && outByteSize > 0;
} }
VkFormat VkTextureManager::ResolveTextureFormat(TextureInternalFormat format) { VkFormat VkTextureManager::GetVkFormat(TextureInternalFormat format) {
switch (format) { switch (format) {
case TextureInternalFormat::RGBA: case TextureInternalFormat::RGBA:
case TextureInternalFormat::RGBA8: case TextureInternalFormat::RGBA8:
MobileGL/MG_Backend/DirectVulkan/Renderer/VkTextureManager.h
+13 -9
View File
@@ -31,7 +31,7 @@ public:
Bool Initialize(const InitInfo& initInfo); Bool Initialize(const InitInfo& initInfo);
void Shutdown(); void Shutdown();
Bool SyncTextureAndGetDescriptor(const MG_State::GLState::ITextureObject& texture, VkDescriptorImageInfo& outImageInfo); Bool SyncTextureAndGetDescriptor(MG_State::GLState::ITextureObject& texture, VkDescriptorImageInfo& outImageInfo);
private: private:
struct TextureResource { struct TextureResource {
@@ -44,16 +44,20 @@ private:
Uint textureExternalIndex = 0; Uint textureExternalIndex = 0;
}; };
Bool EnsureTextureSynced(TextureResource& resource, const MG_State::GLState::ITextureObject& texture); Bool SyncTexture(MG_State::GLState::ITextureObject &texture,
Bool EnsureTextureResource(TextureResource& resource, const MG_State::GLState::ITextureObject& texture, TextureResource &outResource);
TextureUploadTarget level0Target, const IntVec3& texelSize, SizeT byteSize); Bool SyncTextureResource(const MG_State::GLState::ITextureObject &texture,
Bool UploadLevel0(TextureResource& resource, const MG_State::GLState::TextureObjectMipmap& mipmapTexture, TextureUploadTarget level0Target,
TextureUploadTarget level0Target, SizeT byteSize); const IntVec3 &texelSize, SizeT byteSize,
Bool ExecuteImmediate(const std::function<void(VkCommandBuffer)>& recorder) const; TextureResource &resource);
Bool UploadLevel0(MG_State::GLState::TextureObjectMipmap &mipmapTexture,
TextureUploadTarget level0Target, SizeT byteSize,
TextureResource &outResource);
Bool ExecuteCmdBufImmediate(const std::function<void(VkCommandBuffer)>& recorder) const;
void DestroyTextureResource(TextureResource& resource) const; void DestroyTextureResource(TextureResource& resource) const;
static Bool ResolveLevel0(const MG_State::GLState::ITextureObject& texture, TextureUploadTarget& outTarget, static Bool CheckLevel0Completeness(const MG_State::GLState::ITextureObject& texture, TextureUploadTarget& outTarget,
IntVec3& outTexelSize, SizeT& outByteSize); IntVec3& outTexelSize, SizeT& outByteSize);
static VkFormat ResolveTextureFormat(TextureInternalFormat format); static VkFormat GetVkFormat(TextureInternalFormat format);
VkDevice m_device = VK_NULL_HANDLE; VkDevice m_device = VK_NULL_HANDLE;
VkPhysicalDevice m_physicalDevice = VK_NULL_HANDLE; VkPhysicalDevice m_physicalDevice = VK_NULL_HANDLE;