AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pvr: Publicise some static functions from pvr_blit.c

Browse Source 
These will be used to implement ZLS subtile alignment. One function
that was already public has also had its declaration moved from
pvr_private.h to the newly created pvr_blit.h.

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23313>
This commit is contained in:
Matt Coster
2023-02-27 12:19:57 +00:00
committed by Marge Bot
parent c31998b7d3
commit fa8667b728
5 changed files with 180 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imagination/vulkan/pvr_blit.c
+101 -68
View File
@@ -27,6 +27,7 @@
#include <stdint.h>
#include <vulkan/vulkan.h>
#include "pvr_blit.h"
#include "pvr_clear.h"
#include "pvr_csb.h"
#include "pvr_formats.h"
@@ -96,7 +97,7 @@ static void pvr_setup_buffer_surface(struct pvr_transfer_cmd_surface *surface,
rect->extent.height = height;
}
static VkFormat pvr_get_raw_copy_format(VkFormat format)
VkFormat pvr_get_raw_copy_format(VkFormat format)
{
switch (vk_format_get_blocksize(format)) {
case 1:
@@ -690,38 +691,20 @@ void pvr_CmdCopyImage2KHR(VkCommandBuffer commandBuffer,
}
}
static VkResult
pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *cmd_buffer,
const struct pvr_buffer *buffer,
const struct pvr_image *image,
const VkBufferImageCopy2 *region)
VkResult
pvr_copy_buffer_to_image_region_format(struct pvr_cmd_buffer *const cmd_buffer,
const pvr_dev_addr_t buffer_dev_addr,
const struct pvr_image *const image,
const VkBufferImageCopy2 *const region,
const VkFormat src_format,
const VkFormat dst_format,
const uint32_t flags)
{
const VkImageAspectFlags aspect_mask = region->imageSubresource.aspectMask;
uint32_t row_length_in_texels;
uint32_t buffer_slice_size;
uint32_t buffer_layer_size;
uint32_t height_in_blks;
uint32_t row_length;
VkFormat src_format;
VkFormat dst_format;
uint32_t flags = 0;
if (vk_format_has_depth(image->vk.format) &&
vk_format_has_stencil(image->vk.format)) {
flags |= PVR_TRANSFER_CMD_FLAGS_DSMERGE;
if ((aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) != 0) {
src_format = vk_format_stencil_only(image->vk.format);
} else {
src_format = vk_format_depth_only(image->vk.format);
flags |= PVR_TRANSFER_CMD_FLAGS_PICKD;
}
dst_format = image->vk.format;
} else {
src_format = pvr_get_raw_copy_format(image->vk.format);
dst_format = src_format;
}
if (region->bufferRowLength == 0)
row_length_in_texels = region->imageExtent.width;
@@ -757,7 +740,7 @@ pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *cmd_buffer,
pvr_setup_buffer_surface(
&transfer_cmd->sources[0].surface,
&transfer_cmd->sources[0].mappings[0].src_rect,
buffer->dev_addr,
buffer_dev_addr,
buffer_offset,
src_format,
region->imageExtent.width,
@@ -793,6 +776,43 @@ pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *cmd_buffer,
return VK_SUCCESS;
}
VkResult
pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *const cmd_buffer,
const pvr_dev_addr_t buffer_dev_addr,
const struct pvr_image *const image,
const VkBufferImageCopy2 *const region)
{
const VkImageAspectFlags aspect_mask = region->imageSubresource.aspectMask;
VkFormat src_format;
VkFormat dst_format;
uint32_t flags = 0;
if (vk_format_has_depth(image->vk.format) &&
vk_format_has_stencil(image->vk.format)) {
flags |= PVR_TRANSFER_CMD_FLAGS_DSMERGE;
if ((aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) != 0) {
src_format = vk_format_stencil_only(image->vk.format);
} else {
src_format = vk_format_depth_only(image->vk.format);
flags |= PVR_TRANSFER_CMD_FLAGS_PICKD;
}
dst_format = image->vk.format;
} else {
src_format = pvr_get_raw_copy_format(image->vk.format);
dst_format = src_format;
}
return pvr_copy_buffer_to_image_region_format(cmd_buffer,
buffer_dev_addr,
image,
region,
src_format,
dst_format,
flags);
}
void pvr_CmdCopyBufferToImage2KHR(
VkCommandBuffer commandBuffer,
const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo)
@@ -806,7 +826,7 @@ void pvr_CmdCopyBufferToImage2KHR(
for (uint32_t i = 0; i < pCopyBufferToImageInfo->regionCount; i++) {
const VkResult result =
pvr_copy_buffer_to_image_region(cmd_buffer,
src,
src->dev_addr,
dst,
&pCopyBufferToImageInfo->pRegions[i]);
if (result != VK_SUCCESS)
@@ -814,16 +834,15 @@ void pvr_CmdCopyBufferToImage2KHR(
}
}
static VkResult
pvr_copy_image_to_buffer_region(struct pvr_device *device,
struct pvr_cmd_buffer *cmd_buffer,
const struct pvr_image *image,
const struct pvr_buffer *buffer,
const VkBufferImageCopy2 *region)
VkResult
pvr_copy_image_to_buffer_region_format(struct pvr_cmd_buffer *const cmd_buffer,
const struct pvr_image *const image,
const pvr_dev_addr_t buffer_dev_addr,
const VkBufferImageCopy2 *const region,
const VkFormat src_format,
const VkFormat dst_format)
{
const VkImageAspectFlags aspect_mask = region->imageSubresource.aspectMask;
enum pipe_format pformat = vk_format_to_pipe_format(image->vk.format);
VkFormat image_format = pvr_get_copy_format(image->vk.format);
struct pvr_transfer_cmd_surface dst_surface = { 0 };
VkImageSubresource sub_resource;
uint32_t buffer_image_height;
@@ -833,31 +852,10 @@ pvr_copy_image_to_buffer_region(struct pvr_device *device,
VkRect2D dst_rect = { 0 };
uint32_t max_depth_slice;
VkSubresourceLayout info;
VkFormat dst_format;
/* Only images with VK_SAMPLE_COUNT_1_BIT can be copied to buffer. */
assert(image->vk.samples == 1);
/* Only one aspect bit should be set per region. */
assert(util_is_power_of_two_nonzero(aspect_mask));
/* Color and depth aspect copies can be done using an appropriate raw format.
*/
if (aspect_mask & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT)) {
image_format = pvr_get_raw_copy_format(image_format);
dst_format = image_format;
} else if (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) {
/* From the Vulkan spec:
*
* Data copied to or from the stencil aspect of any depth/stencil
* format is tightly packed with one VK_FORMAT_S8_UINT value per texel.
*/
dst_format = VK_FORMAT_S8_UINT;
} else {
/* YUV Planes require specific formats. */
dst_format = image_format;
}
if (region->bufferRowLength == 0)
buffer_row_length = region->imageExtent.width;
else
@@ -879,7 +877,7 @@ pvr_copy_image_to_buffer_region(struct pvr_device *device,
pvr_setup_buffer_surface(&dst_surface,
&dst_rect,
buffer->dev_addr,
buffer_dev_addr,
region->bufferOffset,
dst_format,
buffer_row_length,
@@ -915,7 +913,7 @@ pvr_copy_image_to_buffer_region(struct pvr_device *device,
* the z_position) for the depth slice will be incremented manually in the
* loop below.
*/
pvr_setup_transfer_surface(device,
pvr_setup_transfer_surface(cmd_buffer->device,
&src_surface,
&src_rect,
image,
@@ -924,7 +922,7 @@ pvr_copy_image_to_buffer_region(struct pvr_device *device,
&region->imageOffset,
&region->imageExtent,
region->imageOffset.z,
image_format,
src_format,
region->imageSubresource.aspectMask);
for (uint32_t j = region->imageOffset.z; j < max_depth_slice; j++) {
@@ -934,7 +932,7 @@ pvr_copy_image_to_buffer_region(struct pvr_device *device,
/* TODO: See if we can allocate all the transfer cmds in one go. */
transfer_cmd = pvr_transfer_cmd_alloc(cmd_buffer);
if (!transfer_cmd)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
return vk_error(cmd_buffer->device, VK_ERROR_OUT_OF_HOST_MEMORY);
transfer_cmd->sources[0].mappings[0].src_rect = src_rect;
transfer_cmd->sources[0].mappings[0].dst_rect = dst_rect;
@@ -964,6 +962,42 @@ pvr_copy_image_to_buffer_region(struct pvr_device *device,
return VK_SUCCESS;
}
VkResult
pvr_copy_image_to_buffer_region(struct pvr_cmd_buffer *const cmd_buffer,
const struct pvr_image *const image,
const pvr_dev_addr_t buffer_dev_addr,
const VkBufferImageCopy2 *const region)
{
const VkImageAspectFlags aspect_mask = region->imageSubresource.aspectMask;
VkFormat src_format = pvr_get_copy_format(image->vk.format);
VkFormat dst_format;
/* Color and depth aspect copies can be done using an appropriate raw format.
*/
if (aspect_mask & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT)) {
src_format = pvr_get_raw_copy_format(src_format);
dst_format = src_format;
} else if (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) {
/* From the Vulkan spec:
*
* Data copied to or from the stencil aspect of any depth/stencil
* format is tightly packed with one VK_FORMAT_S8_UINT value per texel.
*/
dst_format = VK_FORMAT_S8_UINT;
} else {
/* YUV Planes require specific formats. */
dst_format = src_format;
}
return pvr_copy_image_to_buffer_region_format(cmd_buffer,
image,
buffer_dev_addr,
region,
src_format,
dst_format);
}
void pvr_CmdCopyImageToBuffer2(
VkCommandBuffer commandBuffer,
const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo)
@@ -976,12 +1010,11 @@ void pvr_CmdCopyImageToBuffer2(
for (uint32_t i = 0U; i < pCopyImageToBufferInfo->regionCount; i++) {
const VkBufferImageCopy2 *region = &pCopyImageToBufferInfo->pRegions[i];
const VkResult result =
pvr_copy_image_to_buffer_region(cmd_buffer->device,
cmd_buffer,
src,
dst,
region);
const VkResult result = pvr_copy_image_to_buffer_region(cmd_buffer,
src,
dst->dev_addr,
region);
if (result != VK_SUCCESS)
return;
}
src/imagination/vulkan/pvr_blit.h
+78
View File
@@ -0,0 +1,78 @@
/*
* Copyright © 2023 Imagination Technologies Ltd.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef PVR_BLIT_H
#define PVR_BLIT_H
#include <stdint.h>
#include <vulkan/vulkan_core.h>
#include "pvr_types.h"
struct pvr_cmd_buffer;
struct pvr_device;
struct pvr_image;
struct pvr_transfer_cmd;
struct pvr_transfer_cmd_surface;
VkFormat pvr_get_raw_copy_format(VkFormat format);
VkResult
pvr_copy_or_resolve_color_image_region(struct pvr_cmd_buffer *cmd_buffer,
const struct pvr_image *src,
const struct pvr_image *dst,
const VkImageCopy2 *region);
VkResult pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *cmd_buffer,
pvr_dev_addr_t buffer_dev_addr,
const struct pvr_image *image,
const VkBufferImageCopy2 *region);
VkResult
pvr_copy_buffer_to_image_region_format(struct pvr_cmd_buffer *cmd_buffer,
pvr_dev_addr_t buffer_dev_addr,
const struct pvr_image *image,
const VkBufferImageCopy2 *region,
VkFormat src_format,
VkFormat dst_format,
uint32_t flags);
VkResult pvr_copy_image_to_buffer_region(struct pvr_cmd_buffer *cmd_buffer,
const struct pvr_image *image,
pvr_dev_addr_t buffer_dev_addr,
const VkBufferImageCopy2 *region);
VkResult
pvr_copy_image_to_buffer_region_format(struct pvr_cmd_buffer *cmd_buffer,
const struct pvr_image *image,
pvr_dev_addr_t buffer_dev_addr,
const VkBufferImageCopy2 *region,
VkFormat src_format,
VkFormat dst_format);
/* TODO: Rename this? */
void pvr_clear_attachments_render_init(struct pvr_cmd_buffer *cmd_buffer,
const VkClearAttachment *attachment,
const VkClearRect *rect);
#endif /* PVR_BLIT_H */
src/imagination/vulkan/pvr_clear.h
-6
View File
@@ -192,10 +192,4 @@ VkResult pvr_clear_vertices_upload(struct pvr_device *device,
float depth,
struct pvr_suballoc_bo **const pvr_bo_out);
/* TODO: Create pvr_blit.h, rename this, and move it there? */
/* This is provided by pvr_blit.c instead of the usual pvr_clear.c . */
void pvr_clear_attachments_render_init(struct pvr_cmd_buffer *cmd_buffer,
const VkClearAttachment *attachment,
const VkClearRect *rect);
#endif /* PVR_CLEAR_H */
src/imagination/vulkan/pvr_cmd_buffer.c
+1
View File
@@ -31,6 +31,7 @@
#include "hwdef/rogue_hw_defs.h"
#include "hwdef/rogue_hw_utils.h"
#include "pvr_blit.h"
#include "pvr_bo.h"
#include "pvr_clear.h"
#include "pvr_common.h"
src/imagination/vulkan/pvr_private.h
-6
View File
@@ -1255,12 +1255,6 @@ void pvr_calculate_vertex_cam_size(const struct pvr_device_info *dev_info,
uint32_t *const cam_size_out,
uint32_t *const vs_max_instances_out);
VkResult
pvr_copy_or_resolve_color_image_region(struct pvr_cmd_buffer *cmd_buffer,
const struct pvr_image *src,
const struct pvr_image *dst,
const VkImageCopy2 *region);
void pvr_get_image_subresource_layout(const struct pvr_image *image,
const VkImageSubresource *subresource,
VkSubresourceLayout *layout);