mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-18 07:23:24 +09:00
[MG_Backend, MG_Impl] (Disaggregated): P5f fm - map texture view attachments through wire identities
This commit is contained in:
@@ -9784,10 +9784,6 @@ void main() {
|
|||||||
srcBinding.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
srcBinding.image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
dstBinding.image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
dstBinding.image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||||
1, ©Region);
|
1, ©Region);
|
||||||
#if MOBILEGL_BUILD_DISAGGREGATED
|
|
||||||
if (wire) m_textureManager->MarkWireTextureGpuWritten(dstEndpoint.TextureHandle,
|
|
||||||
dstMipLevel, dstSlices.BaseArrayLayer(), dstSlices.slicesAreDepth ? 1u : copySliceCount);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
VkPipelineStageFlags srcRestoreStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
|
VkPipelineStageFlags srcRestoreStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
|
||||||
VkAccessFlags srcRestoreAccessMask = 0;
|
VkAccessFlags srcRestoreAccessMask = 0;
|
||||||
|
|||||||
@@ -444,6 +444,8 @@ namespace MobileGL::MG_Backend::DirectVulkan {
|
|||||||
VkImageAspectFlags aspect = 0;
|
VkImageAspectFlags aspect = 0;
|
||||||
Uint32 level = 0, layer = 0, layers = 1, levels = 1;
|
Uint32 level = 0, layer = 0, layers = 1, levels = 1;
|
||||||
Bool isDefault = false;
|
Bool isDefault = false;
|
||||||
|
Bool is3D = false;
|
||||||
|
MG_Pipe::MGPipeHandle storage = MG_Pipe::kMGPipeNullHandle;
|
||||||
};
|
};
|
||||||
WireImage ResolveWireImage(const MG_Pipe::MGPFramebufferState& fbo,
|
WireImage ResolveWireImage(const MG_Pipe::MGPFramebufferState& fbo,
|
||||||
const MG_Pipe::MGPSurface& surface, VkImageAspectFlags aspect);
|
const MG_Pipe::MGPSurface& surface, VkImageAspectFlags aspect);
|
||||||
|
|||||||
@@ -26,21 +26,28 @@
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
if (surface.Kind == MG_Pipe::kMGPipeSurfaceKindNone) return out;
|
if (surface.Kind == MG_Pipe::kMGPipeSurfaceKindNone) return out;
|
||||||
auto* resource = m_textureManager->SyncTextureResourceByHandle(surface.Res,
|
const Bool renderbuffer = surface.Kind == MG_Pipe::kMGPipeSurfaceKindRenderbuffer;
|
||||||
surface.Kind == MG_Pipe::kMGPipeSurfaceKindRenderbuffer);
|
Uint32 level = surface.Level, layer = surface.Layer, availableLayers = 1;
|
||||||
|
VkFormat viewFormat = VK_FORMAT_UNDEFINED;
|
||||||
|
out.storage = renderbuffer ? surface.Res : m_textureManager->ResolveWireTextureStorage(
|
||||||
|
surface.Res, level, layer, &viewFormat, &availableLayers);
|
||||||
|
if (MG_Pipe::MGPipeHandleIsNull(out.storage)) MagmaWireFatal("framebuffer-view-record");
|
||||||
|
auto* resource = m_textureManager->SyncTextureResourceByHandle(out.storage, renderbuffer);
|
||||||
if (!resource) MagmaWireFatal("framebuffer-resource");
|
if (!resource) MagmaWireFatal("framebuffer-resource");
|
||||||
out.image = resource->image;
|
out.image = resource->image;
|
||||||
out.format = resource->format;
|
out.format = viewFormat != VK_FORMAT_UNDEFINED ? viewFormat : resource->format;
|
||||||
out.extent = {std::max(resource->extent.width >> surface.Level, 1u),
|
out.extent = {std::max(resource->extent.width >> level, 1u),
|
||||||
std::max(resource->extent.height >> surface.Level, 1u)};
|
std::max(resource->extent.height >> level, 1u)};
|
||||||
out.layout = resource->layout;
|
out.layout = resource->layout;
|
||||||
out.trackedLayout = &resource->layout;
|
out.trackedLayout = &resource->layout;
|
||||||
out.samples = resource->sampleCount;
|
out.samples = resource->sampleCount;
|
||||||
out.level = surface.Level;
|
out.level = level;
|
||||||
out.levels = resource->mipLevels;
|
out.levels = resource->mipLevels;
|
||||||
out.layer = surface.Layer;
|
out.layer = layer;
|
||||||
out.layers = surface.Layered ? resource->arrayLayers : 1;
|
out.is3D = resource->depth > 1;
|
||||||
if (out.level >= resource->mipLevels || out.layer + out.layers > resource->arrayLayers)
|
out.layers = surface.Layered ? (out.is3D ? std::max(resource->depth >> level, 1u) : availableLayers) : 1;
|
||||||
|
if (out.level >= resource->mipLevels || out.layer + out.layers >
|
||||||
|
(out.is3D ? std::max(resource->depth >> level, 1u) : resource->arrayLayers))
|
||||||
MagmaWireFatal("framebuffer-subresource");
|
MagmaWireFatal("framebuffer-subresource");
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
@@ -167,7 +174,7 @@
|
|||||||
vkDestroyRenderPass(m_device, pass, nullptr);
|
vkDestroyRenderPass(m_device, pass, nullptr);
|
||||||
vkDestroyImageView(m_device, view, nullptr);
|
vkDestroyImageView(m_device, view, nullptr);
|
||||||
if (!image.isDefault && surface.Kind == MG_Pipe::kMGPipeSurfaceKindTexture)
|
if (!image.isDefault && surface.Kind == MG_Pipe::kMGPipeSurfaceKindTexture)
|
||||||
m_textureManager->MarkWireTextureGpuWritten(surface.Res, image.level, image.layer, image.layers);
|
m_textureManager->MarkWireTextureGpuWritten(image.storage, image.level, image.layer, image.layers);
|
||||||
if (image.isDefault) {
|
if (image.isDefault) {
|
||||||
if (color) m_swapchainObject.SetImageContentDefined(m_imageIndexAcquired, true);
|
if (color) m_swapchainObject.SetImageContentDefined(m_imageIndexAcquired, true);
|
||||||
else m_swapchainObject.SetDepthStencilContentDefined(m_imageIndexAcquired, true);
|
else m_swapchainObject.SetDepthStencilContentDefined(m_imageIndexAcquired, true);
|
||||||
@@ -220,8 +227,8 @@
|
|||||||
if (source.isDefault && !MapDefaultFramebufferReadbackRect(x,y,width,height,source.extent,
|
if (source.isDefault && !MapDefaultFramebufferReadbackRect(x,y,width,height,source.extent,
|
||||||
m_swapchainObject.GetPreTransform(),&offset,&extent)) MagmaWireFatal("read-surface-transform");
|
m_swapchainObject.GetPreTransform(),&offset,&extent)) MagmaWireFatal("read-surface-transform");
|
||||||
VkBufferImageCopy region{};
|
VkBufferImageCopy region{};
|
||||||
region.imageSubresource = {aspect,source.level,source.layer,1};
|
region.imageSubresource = {aspect,source.level,source.is3D ? 0u : source.layer,1};
|
||||||
region.imageOffset = {offset.x,offset.y,0};
|
region.imageOffset = {offset.x,offset.y,source.is3D ? static_cast<Int32>(source.layer) : 0};
|
||||||
region.imageExtent = {extent.width,extent.height,1};
|
region.imageExtent = {extent.width,extent.height,1};
|
||||||
auto& frame = m_frameContext.GetCurrent();
|
auto& frame = m_frameContext.GetCurrent();
|
||||||
vkCmdCopyImageToBuffer(frame.commandBuffer,source.image,VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
vkCmdCopyImageToBuffer(frame.commandBuffer,source.image,VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
@@ -256,8 +263,12 @@
|
|||||||
WireImage destination = ResolveWireImage(*draw,dst,aspect);
|
WireImage destination = ResolveWireImage(*draw,dst,aspect);
|
||||||
if (!source.image || !destination.image) return;
|
if (!source.image || !destination.image) return;
|
||||||
m_textureManager->FlushPendingUploads();
|
m_textureManager->FlushPendingUploads();
|
||||||
TransitionWireImage(source,VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
|
const Bool sameImage = source.image == destination.image;
|
||||||
TransitionWireImage(destination,VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
|
const VkImageLayout srcLayout = sameImage ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
|
||||||
|
const VkImageLayout dstLayout = sameImage ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
|
||||||
|
TransitionWireImage(source,srcLayout);
|
||||||
|
if (sameImage) destination.layout = source.layout;
|
||||||
|
else TransitionWireImage(destination,dstLayout);
|
||||||
VkImageBlit region{};
|
VkImageBlit region{};
|
||||||
region.srcSubresource = {aspect,source.level,source.layer,1};
|
region.srcSubresource = {aspect,source.level,source.layer,1};
|
||||||
region.dstSubresource = {aspect,destination.level,destination.layer,1};
|
region.dstSubresource = {aspect,destination.level,destination.layer,1};
|
||||||
@@ -272,12 +283,15 @@
|
|||||||
region.dstOffsets[0].y = static_cast<GLint>(destination.extent.height)-dy0;
|
region.dstOffsets[0].y = static_cast<GLint>(destination.extent.height)-dy0;
|
||||||
region.dstOffsets[1].y = static_cast<GLint>(destination.extent.height)-dy1;
|
region.dstOffsets[1].y = static_cast<GLint>(destination.extent.height)-dy1;
|
||||||
}
|
}
|
||||||
vkCmdBlitImage(m_frameContext.GetCurrent().commandBuffer,source.image,VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
vkCmdBlitImage(m_frameContext.GetCurrent().commandBuffer,source.image,srcLayout,
|
||||||
destination.image,VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,1,®ion,
|
destination.image,dstLayout,1,®ion,
|
||||||
filter == GL_LINEAR ? VK_FILTER_LINEAR : VK_FILTER_NEAREST);
|
filter == GL_LINEAR ? VK_FILTER_LINEAR : VK_FILTER_NEAREST);
|
||||||
if (!destination.isDefault && dst.Kind == MG_Pipe::kMGPipeSurfaceKindTexture)
|
if (!destination.isDefault && dst.Kind == MG_Pipe::kMGPipeSurfaceKindTexture)
|
||||||
m_textureManager->MarkWireTextureGpuWritten(dst.Res, destination.level, destination.layer, destination.layers);
|
m_textureManager->MarkWireTextureGpuWritten(destination.storage, destination.level, destination.layer, destination.layers);
|
||||||
if (destination.isDefault) m_swapchainObject.SetImageContentDefined(m_imageIndexAcquired,true);
|
if (destination.isDefault) {
|
||||||
|
if (aspect == VK_IMAGE_ASPECT_COLOR_BIT) m_swapchainObject.SetImageContentDefined(m_imageIndexAcquired,true);
|
||||||
|
else m_swapchainObject.SetDepthStencilContentDefined(m_imageIndexAcquired,true);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
if (mask & GL_COLOR_BUFFER_BIT) {
|
if (mask & GL_COLOR_BUFFER_BIT) {
|
||||||
for (Uint32 i=0;i<MG_Pipe::kMGPipeMaxColorAttachments;++i) {
|
for (Uint32 i=0;i<MG_Pipe::kMGPipeMaxColorAttachments;++i) {
|
||||||
@@ -327,7 +341,7 @@
|
|||||||
}
|
}
|
||||||
vkCmdBlitImage(m_frameContext.GetCurrent().commandBuffer,source.image,VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
vkCmdBlitImage(m_frameContext.GetCurrent().commandBuffer,source.image,VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
|
||||||
destination.image,VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,1,®ion,VK_FILTER_NEAREST);
|
destination.image,VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,1,®ion,VK_FILTER_NEAREST);
|
||||||
m_textureManager->MarkWireTextureGpuWritten(state.VerbCopyTexDst,destination.level,destination.layer);
|
m_textureManager->MarkWireTextureGpuWritten(destination.storage,destination.level,destination.layer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VulkanRenderer::GenerateWireMipmap() {
|
void VulkanRenderer::GenerateWireMipmap() {
|
||||||
|
|||||||
@@ -6077,6 +6077,10 @@ namespace MobileGL::MG_Impl::GLImpl {
|
|||||||
viewObject->SetInternalFormat(viewInternalFormat);
|
viewObject->SetInternalFormat(viewInternalFormat);
|
||||||
viewObject->SetSamples(storageOwner->GetSamples());
|
viewObject->SetSamples(storageOwner->GetSamples());
|
||||||
viewObject->SetFixedSampleLocations(storageOwner->HasFixedSampleLocations());
|
viewObject->SetFixedSampleLocations(storageOwner->HasFixedSampleLocations());
|
||||||
|
#if MOBILEGL_BUILD_DISAGGREGATED
|
||||||
|
if (MG_Config::Transport != MG_Config::TransportMode::Monolith)
|
||||||
|
MG_Pipe::MGPipeEmitSamplerViewCreate(*viewObject);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) {
|
void TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) {
|
||||||
|
|||||||
Reference in New Issue
Block a user