Mesa (master): v3dv: rename playout and dslayout fields to use underscores.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 17 12:17:46 UTC 2020
Module: Mesa
Branch: master
Commit: 249aed1ff067116d6279fe2484ccc52f0405840a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=249aed1ff067116d6279fe2484ccc52f0405840a
Author: Iago Toral Quiroga <itoral at igalia.com>
Date: Tue Nov 17 12:10:59 2020 +0100
v3dv: rename playout and dslayout fields to use underscores.
Following a suggestion from Alejandro, since playout is a word on its own
and can be confusing. It also makes it more consistent with other
variable names that use an underscore.
Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7651>
---
src/broadcom/vulkan/v3dv_meta_clear.c | 22 +++++++++---------
src/broadcom/vulkan/v3dv_meta_copy.c | 42 +++++++++++++++++------------------
src/broadcom/vulkan/v3dv_private.h | 12 +++++-----
3 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/broadcom/vulkan/v3dv_meta_clear.c b/src/broadcom/vulkan/v3dv_meta_clear.c
index d916209ffa3..d906a7ec75a 100644
--- a/src/broadcom/vulkan/v3dv_meta_clear.c
+++ b/src/broadcom/vulkan/v3dv_meta_clear.c
@@ -89,13 +89,13 @@ v3dv_meta_clear_init(struct v3dv_device *device)
_mesa_hash_table_create(NULL, u64_hash, u64_compare);
create_color_clear_pipeline_layout(device,
- &device->meta.color_clear.playout);
+ &device->meta.color_clear.p_layout);
device->meta.depth_clear.cache =
_mesa_hash_table_create(NULL, u64_hash, u64_compare);
create_depth_clear_pipeline_layout(device,
- &device->meta.depth_clear.playout);
+ &device->meta.depth_clear.p_layout);
}
void
@@ -109,8 +109,8 @@ v3dv_meta_clear_finish(struct v3dv_device *device)
}
_mesa_hash_table_destroy(device->meta.color_clear.cache, NULL);
- if (device->meta.color_clear.playout) {
- v3dv_DestroyPipelineLayout(_device, device->meta.color_clear.playout,
+ if (device->meta.color_clear.p_layout) {
+ v3dv_DestroyPipelineLayout(_device, device->meta.color_clear.p_layout,
&device->alloc);
}
@@ -120,8 +120,8 @@ v3dv_meta_clear_finish(struct v3dv_device *device)
}
_mesa_hash_table_destroy(device->meta.depth_clear.cache, NULL);
- if (device->meta.depth_clear.playout) {
- v3dv_DestroyPipelineLayout(_device, device->meta.depth_clear.playout,
+ if (device->meta.depth_clear.p_layout) {
+ v3dv_DestroyPipelineLayout(_device, device->meta.depth_clear.p_layout,
&device->alloc);
}
}
@@ -640,7 +640,7 @@ get_color_clear_pipeline(struct v3dv_device *device,
format,
samples,
components,
- device->meta.color_clear.playout,
+ device->meta.color_clear.p_layout,
&(*pipeline)->pipeline);
if (result != VK_SUCCESS)
goto fail;
@@ -715,7 +715,7 @@ get_depth_clear_pipeline(struct v3dv_device *device,
pass,
subpass_idx,
samples,
- device->meta.depth_clear.playout,
+ device->meta.depth_clear.p_layout,
&(*pipeline)->pipeline);
if (result != VK_SUCCESS)
goto fail;
@@ -903,7 +903,7 @@ emit_color_clear_rect(struct v3dv_cmd_buffer *cmd_buffer,
job->is_subpass_continue = true;
v3dv_CmdPushConstants(cmd_buffer_handle,
- device->meta.color_clear.playout,
+ device->meta.color_clear.p_layout,
VK_SHADER_STAGE_FRAGMENT_BIT, 0, 16,
&clear_color);
@@ -1048,7 +1048,7 @@ emit_subpass_color_clear_rects(struct v3dv_cmd_buffer *cmd_buffer,
VkCommandBuffer cmd_buffer_handle = v3dv_cmd_buffer_to_handle(cmd_buffer);
v3dv_CmdPushConstants(cmd_buffer_handle,
- cmd_buffer->device->meta.depth_clear.playout,
+ cmd_buffer->device->meta.depth_clear.p_layout,
VK_SHADER_STAGE_FRAGMENT_BIT, 0, 16,
clear_color->float32);
@@ -1126,7 +1126,7 @@ emit_subpass_ds_clear_rects(struct v3dv_cmd_buffer *cmd_buffer,
VkCommandBuffer cmd_buffer_handle = v3dv_cmd_buffer_to_handle(cmd_buffer);
v3dv_CmdPushConstants(cmd_buffer_handle,
- cmd_buffer->device->meta.depth_clear.playout,
+ cmd_buffer->device->meta.depth_clear.p_layout,
VK_SHADER_STAGE_FRAGMENT_BIT, 0, 4,
&clear_ds->depth);
diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c
index 9fde1ee89fb..2a3e238bd80 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -97,8 +97,8 @@ v3dv_meta_blit_init(struct v3dv_device *device)
}
create_blit_pipeline_layout(device,
- &device->meta.blit.dslayout,
- &device->meta.blit.playout);
+ &device->meta.blit.ds_layout,
+ &device->meta.blit.p_layout);
}
void
@@ -117,13 +117,13 @@ v3dv_meta_blit_finish(struct v3dv_device *device)
_mesa_hash_table_destroy(device->meta.blit.cache[i], NULL);
}
- if (device->meta.blit.playout) {
- v3dv_DestroyPipelineLayout(_device, device->meta.blit.playout,
+ if (device->meta.blit.p_layout) {
+ v3dv_DestroyPipelineLayout(_device, device->meta.blit.p_layout,
&device->alloc);
}
- if (device->meta.blit.dslayout) {
- v3dv_DestroyDescriptorSetLayout(_device, device->meta.blit.dslayout,
+ if (device->meta.blit.ds_layout) {
+ v3dv_DestroyDescriptorSetLayout(_device, device->meta.blit.ds_layout,
&device->alloc);
}
}
@@ -198,8 +198,8 @@ v3dv_meta_texel_buffer_copy_init(struct v3dv_device *device)
create_texel_buffer_copy_pipeline_layout(
device,
- &device->meta.texel_buffer_copy.dslayout,
- &device->meta.texel_buffer_copy.playout);
+ &device->meta.texel_buffer_copy.ds_layout,
+ &device->meta.texel_buffer_copy.p_layout);
}
void
@@ -218,13 +218,13 @@ v3dv_meta_texel_buffer_copy_finish(struct v3dv_device *device)
_mesa_hash_table_destroy(device->meta.texel_buffer_copy.cache[i], NULL);
}
- if (device->meta.texel_buffer_copy.playout) {
- v3dv_DestroyPipelineLayout(_device, device->meta.texel_buffer_copy.playout,
+ if (device->meta.texel_buffer_copy.p_layout) {
+ v3dv_DestroyPipelineLayout(_device, device->meta.texel_buffer_copy.p_layout,
&device->alloc);
}
- if (device->meta.texel_buffer_copy.dslayout) {
- v3dv_DestroyDescriptorSetLayout(_device, device->meta.texel_buffer_copy.dslayout,
+ if (device->meta.texel_buffer_copy.ds_layout) {
+ v3dv_DestroyDescriptorSetLayout(_device, device->meta.texel_buffer_copy.ds_layout,
&device->alloc);
}
}
@@ -2735,7 +2735,7 @@ allocate_texel_buffer_copy_descriptor_set(struct v3dv_cmd_buffer *cmd_buffer,
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.descriptorPool = cmd_buffer->meta.texel_buffer_copy.dspool,
.descriptorSetCount = 1,
- .pSetLayouts = &device->meta.texel_buffer_copy.dslayout,
+ .pSetLayouts = &device->meta.texel_buffer_copy.ds_layout,
};
result = v3dv_AllocateDescriptorSets(_device, &info, set);
@@ -3023,7 +3023,7 @@ get_copy_texel_buffer_pipeline(
create_texel_buffer_copy_pipeline(device,
format,
(*pipeline)->pass,
- device->meta.texel_buffer_copy.playout,
+ device->meta.texel_buffer_copy.p_layout,
&(*pipeline)->pipeline);
if (!ok)
goto fail;
@@ -3178,7 +3178,7 @@ texel_buffer_shader_copy(struct v3dv_cmd_buffer *cmd_buffer,
v3dv_CmdBindDescriptorSets(_cmd_buffer,
VK_PIPELINE_BIND_POINT_GRAPHICS,
- cmd_buffer->device->meta.texel_buffer_copy.playout,
+ cmd_buffer->device->meta.texel_buffer_copy.p_layout,
0, 1, &set,
0, NULL);
@@ -3298,7 +3298,7 @@ texel_buffer_shader_copy(struct v3dv_cmd_buffer *cmd_buffer,
};
v3dv_CmdPushConstants(_cmd_buffer,
- cmd_buffer->device->meta.texel_buffer_copy.playout,
+ cmd_buffer->device->meta.texel_buffer_copy.p_layout,
VK_SHADER_STAGE_FRAGMENT_BIT,
0, sizeof(push_data), &push_data);
@@ -4630,7 +4630,7 @@ get_blit_pipeline(struct v3dv_device *device,
dst_samples,
src_samples,
(*pipeline)->pass,
- device->meta.blit.playout,
+ device->meta.blit.p_layout,
&(*pipeline)->pipeline);
if (!ok)
goto fail;
@@ -4764,7 +4764,7 @@ allocate_blit_source_descriptor_set(struct v3dv_cmd_buffer *cmd_buffer,
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO,
.descriptorPool = cmd_buffer->meta.blit.dspool,
.descriptorSetCount = 1,
- .pSetLayouts = &device->meta.blit.dslayout,
+ .pSetLayouts = &device->meta.blit.ds_layout,
};
result = v3dv_AllocateDescriptorSets(_device, &info, set);
@@ -4979,7 +4979,7 @@ blit_shader(struct v3dv_cmd_buffer *cmd_buffer,
pipeline->pass && pipeline->pass_no_load);
struct v3dv_device *device = cmd_buffer->device;
- assert(device->meta.blit.dslayout);
+ assert(device->meta.blit.ds_layout);
VkDevice _device = v3dv_device_to_handle(device);
VkCommandBuffer _cmd_buffer = v3dv_cmd_buffer_to_handle(cmd_buffer);
@@ -5140,7 +5140,7 @@ blit_shader(struct v3dv_cmd_buffer *cmd_buffer,
v3dv_CmdBindDescriptorSets(_cmd_buffer,
VK_PIPELINE_BIND_POINT_GRAPHICS,
- device->meta.blit.playout,
+ device->meta.blit.p_layout,
0, 1, &set,
0, NULL);
@@ -5190,7 +5190,7 @@ blit_shader(struct v3dv_cmd_buffer *cmd_buffer,
}
v3dv_CmdPushConstants(_cmd_buffer,
- device->meta.blit.playout,
+ device->meta.blit.p_layout,
VK_SHADER_STAGE_VERTEX_BIT, 0, 20,
&tex_coords);
diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 0b474e8b69e..4d7e70c4737 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -321,21 +321,21 @@ struct v3dv_device {
struct {
mtx_t mtx;
struct {
- VkPipelineLayout playout;
+ VkPipelineLayout p_layout;
struct hash_table *cache; /* v3dv_meta_color_clear_pipeline */
} color_clear;
struct {
- VkPipelineLayout playout;
+ VkPipelineLayout p_layout;
struct hash_table *cache; /* v3dv_meta_depth_clear_pipeline */
} depth_clear;
struct {
- VkDescriptorSetLayout dslayout;
- VkPipelineLayout playout;
+ VkDescriptorSetLayout ds_layout;
+ VkPipelineLayout p_layout;
struct hash_table *cache[3]; /* v3dv_meta_blit_pipeline for 1d, 2d, 3d */
} blit;
struct {
- VkDescriptorSetLayout dslayout;
- VkPipelineLayout playout;
+ VkDescriptorSetLayout ds_layout;
+ VkPipelineLayout p_layout;
struct hash_table *cache[3]; /* v3dv_meta_texel_buffer_copy_pipeline for 1d, 2d, 3d */
} texel_buffer_copy;
} meta;
More information about the mesa-commit
mailing list