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

vulkan/meta: Remove object types from vk_meta_object_key_type

Browse Source 
Most values are used for multiple object types. It also is not
necessary, because the object type is already included in the key.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32881>
This commit is contained in:
Konstantin Seurer
2025-01-03 14:16:23 +01:00
parent 3319e496f7
commit 1bba4cf21b
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asahi/vulkan/hk_cmd_meta.c
+4 -4
View File
@@ -797,7 +797,7 @@ hk_meta_copy_image_to_buffer2(struct vk_command_buffer *cmd,
bool is_3d = region->imageExtent.depth > 1;
struct vk_meta_image_copy_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
.type = IMG2BUF,
.block_size = blocksize_B,
.nr_samples = image->samples,
@@ -982,7 +982,7 @@ hk_meta_copy_buffer_to_image2(struct vk_command_buffer *cmd,
bool is_3d = region->imageExtent.depth > 1;
struct vk_meta_image_copy_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
.type = BUF2IMG,
.block_size = blocksize_B,
.nr_samples = image->samples,
@@ -1141,8 +1141,8 @@ hk_meta_copy_image2(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
: (1 << aspect);
struct vk_meta_image_copy_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
.type = IMG2IMG,
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
.type = IMG2IMG
.block_size = blocksize_B,
.nr_samples = dst_image->samples,
.src_format = hk_format_to_pipe_format(canonical),
src/vulkan/runtime/vk_meta.h
+8 -8
View File
@@ -158,14 +158,14 @@ void vk_meta_device_finish(struct vk_device *device,
/** Keys should start with one of these to ensure uniqueness */
enum vk_meta_object_key_type {
VK_META_OBJECT_KEY_TYPE_INVALID = 0,
VK_META_OBJECT_KEY_CLEAR_PIPELINE,
VK_META_OBJECT_KEY_BLIT_PIPELINE,
VK_META_OBJECT_KEY_BLIT_SAMPLER,
VK_META_OBJECT_KEY_COPY_BUFFER_PIPELINE,
VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE_PIPELINE,
VK_META_OBJECT_KEY_COPY_IMAGE_PIPELINE,
VK_META_OBJECT_KEY_FILL_BUFFER_PIPELINE,
VK_META_OBJECT_KEY_CLEAR,
VK_META_OBJECT_KEY_BLIT,
VK_META_OBJECT_KEY_COPY_BUFFER,
VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE,
VK_META_OBJECT_KEY_COPY_IMAGE,
VK_META_OBJECT_KEY_FILL_BUFFER,
/* BVH build pipelines */
VK_META_OBJECT_KEY_LEAF,
src/vulkan/runtime/vk_meta_blit_resolve.c
+3 -3
View File
@@ -470,7 +470,7 @@ get_blit_sampler(struct vk_device *device,
} key;
memset(&key, 0, sizeof(key));
key.key_type = VK_META_OBJECT_KEY_BLIT_SAMPLER;
key.key_type = VK_META_OBJECT_KEY_BLIT;
key.filter = filter;
VkSampler from_cache = vk_meta_lookup_sampler(meta, &key, sizeof(key));
@@ -734,7 +734,7 @@ vk_meta_blit_image(struct vk_command_buffer *cmd,
struct vk_meta_blit_key key;
memset(&key, 0, sizeof(key));
key.key_type = VK_META_OBJECT_KEY_BLIT_PIPELINE;
key.key_type = VK_META_OBJECT_KEY_BLIT;
key.src_samples = src_image->samples;
key.dim = vk_image_sampler_dim(src_image);
key.dst_format = dst_format;
@@ -825,7 +825,7 @@ vk_meta_resolve_image(struct vk_command_buffer *cmd,
{
struct vk_meta_blit_key key;
memset(&key, 0, sizeof(key));
key.key_type = VK_META_OBJECT_KEY_BLIT_PIPELINE;
key.key_type = VK_META_OBJECT_KEY_BLIT;
key.dim = vk_image_sampler_dim(src_image);
key.src_samples = src_image->samples;
key.resolve_mode = resolve_mode;
src/vulkan/runtime/vk_meta_clear.c
+1 -1
View File
@@ -209,7 +209,7 @@ vk_meta_clear_attachments(struct vk_command_buffer *cmd,
struct vk_meta_clear_key key;
memset(&key, 0, sizeof(key));
key.key_type = VK_META_OBJECT_KEY_CLEAR_PIPELINE;
key.key_type = VK_META_OBJECT_KEY_CLEAR;
vk_meta_rendering_info_copy(&key.render, render);
struct vk_meta_clear_push_data push = {0};
src/vulkan/runtime/vk_meta_copy_fill_update.c
+7 -7
View File
@@ -1323,7 +1323,7 @@ copy_image_to_buffer_region(
struct vk_device *dev = cmd->base.device;
const struct vk_device_dispatch_table *disp = &dev->dispatch_table;
struct vk_meta_copy_buffer_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_TO_BUFFER,
.bind_point = VK_PIPELINE_BIND_POINT_COMPUTE,
.img = {
.view = img_copy_view_info(vk_image_sampled_view_type(img),
@@ -1503,7 +1503,7 @@ copy_buffer_to_image_region_gfx(
: (VkImageViewType)-1;
struct vk_meta_copy_buffer_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE,
.bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS,
.img = {
.view = img_copy_view_info(view_type,
@@ -1548,7 +1548,7 @@ copy_buffer_to_image_region_compute(
const struct vk_device_dispatch_table *disp = &dev->dispatch_table;
VkImageViewType view_type = vk_image_storage_view_type(img);
struct vk_meta_copy_buffer_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_BUFFER_TO_IMAGE,
.bind_point = VK_PIPELINE_BIND_POINT_COMPUTE,
.img = {
.view = img_copy_view_info(view_type,
@@ -2037,7 +2037,7 @@ copy_image_region_gfx(struct vk_command_buffer *cmd,
region->dstSubresource.aspectMask);
struct vk_meta_copy_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE,
.bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS,
.samples = src_img->samples,
.aspects = region->srcSubresource.aspectMask,
@@ -2098,7 +2098,7 @@ copy_image_region_compute(struct vk_command_buffer *cmd,
region->dstSubresource.aspectMask);
struct vk_meta_copy_image_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_IMAGE,
.bind_point = VK_PIPELINE_BIND_POINT_COMPUTE,
.samples = src_img->samples,
.aspects = region->srcSubresource.aspectMask,
@@ -2272,7 +2272,7 @@ copy_buffer_region(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
VkResult result;
struct vk_meta_copy_buffer_key key = {
.key_type = VK_META_OBJECT_KEY_COPY_BUFFER_PIPELINE,
.key_type = VK_META_OBJECT_KEY_COPY_BUFFER,
};
VkDeviceSize size = region->size;
@@ -2452,7 +2452,7 @@ vk_meta_fill_buffer(struct vk_command_buffer *cmd, struct vk_meta_device *meta,
VkResult result;
struct vk_meta_fill_buffer_key key = {
.key_type = VK_META_OBJECT_KEY_FILL_BUFFER_PIPELINE,
.key_type = VK_META_OBJECT_KEY_FILL_BUFFER,
};
VkPipelineLayout pipeline_layout;