Mesa (master): v3dv: initialize pipeline layouts for meta operations at driver initialization
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 17 12:17:46 UTC 2020
Module: Mesa
Branch: master
Commit: 840ba2513a21b29aaf7e5a190a838e4111862be4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=840ba2513a21b29aaf7e5a190a838e4111862be4
Author: Iago Toral Quiroga <itoral at igalia.com>
Date: Tue Nov 17 09:09:06 2020 +0100
v3dv: initialize pipeline layouts for meta operations at driver initialization
This removes the need to lock just to check if we have created them
due to the lazy allocation strategy we had in place.
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 | 90 ++++++--------
src/broadcom/vulkan/v3dv_meta_copy.c | 215 ++++++++++++++++------------------
2 files changed, 140 insertions(+), 165 deletions(-)
diff --git a/src/broadcom/vulkan/v3dv_meta_clear.c b/src/broadcom/vulkan/v3dv_meta_clear.c
index 5edd8a3e2f2..d916209ffa3 100644
--- a/src/broadcom/vulkan/v3dv_meta_clear.c
+++ b/src/broadcom/vulkan/v3dv_meta_clear.c
@@ -50,14 +50,52 @@ destroy_depth_clear_pipeline(VkDevice _device,
vk_free(alloc, p);
}
+static VkResult
+create_color_clear_pipeline_layout(struct v3dv_device *device,
+ VkPipelineLayout *pipeline_layout)
+{
+ VkPipelineLayoutCreateInfo info = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
+ .setLayoutCount = 0,
+ .pushConstantRangeCount = 1,
+ .pPushConstantRanges =
+ &(VkPushConstantRange) { VK_SHADER_STAGE_FRAGMENT_BIT, 0, 16 },
+ };
+
+ return v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
+ &info, &device->alloc, pipeline_layout);
+}
+
+static VkResult
+create_depth_clear_pipeline_layout(struct v3dv_device *device,
+ VkPipelineLayout *pipeline_layout)
+{
+ VkPipelineLayoutCreateInfo info = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
+ .setLayoutCount = 0,
+ .pushConstantRangeCount = 1,
+ .pPushConstantRanges =
+ &(VkPushConstantRange) { VK_SHADER_STAGE_FRAGMENT_BIT, 0, 4 },
+ };
+
+ return v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
+ &info, &device->alloc, pipeline_layout);
+}
+
void
v3dv_meta_clear_init(struct v3dv_device *device)
{
device->meta.color_clear.cache =
_mesa_hash_table_create(NULL, u64_hash, u64_compare);
+ create_color_clear_pipeline_layout(device,
+ &device->meta.color_clear.playout);
+
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);
}
void
@@ -200,38 +238,6 @@ get_depth_clear_rect_fs()
return b.shader;
}
-static VkResult
-create_color_clear_pipeline_layout(struct v3dv_device *device,
- VkPipelineLayout *pipeline_layout)
-{
- VkPipelineLayoutCreateInfo info = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
- .setLayoutCount = 0,
- .pushConstantRangeCount = 1,
- .pPushConstantRanges =
- &(VkPushConstantRange) { VK_SHADER_STAGE_FRAGMENT_BIT, 0, 16 },
- };
-
- return v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
- &info, &device->alloc, pipeline_layout);
-}
-
-static VkResult
-create_depth_clear_pipeline_layout(struct v3dv_device *device,
- VkPipelineLayout *pipeline_layout)
-{
- VkPipelineLayoutCreateInfo info = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
- .setLayoutCount = 0,
- .pushConstantRangeCount = 1,
- .pPushConstantRanges =
- &(VkPushConstantRange) { VK_SHADER_STAGE_FRAGMENT_BIT, 0, 4 },
- };
-
- return v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
- &info, &device->alloc, pipeline_layout);
-}
-
static VkResult
create_pipeline(struct v3dv_device *device,
struct v3dv_render_pass *pass,
@@ -576,16 +582,6 @@ get_color_clear_pipeline(struct v3dv_device *device,
VkResult result = VK_SUCCESS;
- mtx_lock(&device->meta.mtx);
- if (!device->meta.color_clear.playout) {
- result =
- create_color_clear_pipeline_layout(device,
- &device->meta.color_clear.playout);
- }
- mtx_unlock(&device->meta.mtx);
- if (result != VK_SUCCESS)
- return result;
-
/* If pass != NULL it means that we are emitting the clear as a draw call
* in the current pass bound by the application. In that case, we can't
* cache the pipeline, since it will be referencing that pass and the
@@ -691,16 +687,6 @@ get_depth_clear_pipeline(struct v3dv_device *device,
VkResult result = VK_SUCCESS;
- mtx_lock(&device->meta.mtx);
- if (!device->meta.depth_clear.playout) {
- result =
- create_depth_clear_pipeline_layout(device,
- &device->meta.depth_clear.playout);
- }
- mtx_unlock(&device->meta.mtx);
- if (result != VK_SUCCESS)
- return result;
-
const uint32_t samples = pass->attachments[attachment_idx].desc.samples;
const VkFormat format = pass->attachments[attachment_idx].desc.format;
assert(vk_format_is_depth_or_stencil(format));
diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c
index da91af994e1..0f0ce58786f 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -40,6 +40,52 @@ meta_blit_key_compare(const void *key1, const void *key2)
return memcmp(key1, key2, V3DV_META_BLIT_CACHE_KEY_SIZE) == 0;
}
+static bool
+create_blit_pipeline_layout(struct v3dv_device *device,
+ VkDescriptorSetLayout *descriptor_set_layout,
+ VkPipelineLayout *pipeline_layout)
+{
+ VkResult result;
+
+ if (*descriptor_set_layout == 0) {
+ VkDescriptorSetLayoutBinding descriptor_set_layout_binding = {
+ .binding = 0,
+ .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+ .descriptorCount = 1,
+ .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
+ };
+ VkDescriptorSetLayoutCreateInfo descriptor_set_layout_info = {
+ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+ .bindingCount = 1,
+ .pBindings = &descriptor_set_layout_binding,
+ };
+ result =
+ v3dv_CreateDescriptorSetLayout(v3dv_device_to_handle(device),
+ &descriptor_set_layout_info,
+ &device->alloc,
+ descriptor_set_layout);
+ if (result != VK_SUCCESS)
+ return false;
+ }
+
+ assert(*pipeline_layout == 0);
+ VkPipelineLayoutCreateInfo pipeline_layout_info = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
+ .setLayoutCount = 1,
+ .pSetLayouts = descriptor_set_layout,
+ .pushConstantRangeCount = 1,
+ .pPushConstantRanges =
+ &(VkPushConstantRange) { VK_SHADER_STAGE_VERTEX_BIT, 0, 20 },
+ };
+
+ result =
+ v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
+ &pipeline_layout_info,
+ &device->alloc,
+ pipeline_layout);
+ return result == VK_SUCCESS;
+}
+
void
v3dv_meta_blit_init(struct v3dv_device *device)
{
@@ -49,6 +95,10 @@ v3dv_meta_blit_init(struct v3dv_device *device)
meta_blit_key_hash,
meta_blit_key_compare);
}
+
+ create_blit_pipeline_layout(device,
+ &device->meta.blit.dslayout,
+ &device->meta.blit.playout);
}
void
@@ -90,6 +140,52 @@ meta_texel_buffer_copy_key_compare(const void *key1, const void *key2)
return memcmp(key1, key2, V3DV_META_TEXEL_BUFFER_COPY_CACHE_KEY_SIZE) == 0;
}
+static bool
+create_texel_buffer_copy_pipeline_layout(struct v3dv_device *device,
+ VkDescriptorSetLayout *ds_layout,
+ VkPipelineLayout *p_layout)
+{
+ VkResult result;
+
+ if (*ds_layout == 0) {
+ VkDescriptorSetLayoutBinding ds_layout_binding = {
+ .binding = 0,
+ .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,
+ .descriptorCount = 1,
+ .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
+ };
+ VkDescriptorSetLayoutCreateInfo ds_layout_info = {
+ .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+ .bindingCount = 1,
+ .pBindings = &ds_layout_binding,
+ };
+ result =
+ v3dv_CreateDescriptorSetLayout(v3dv_device_to_handle(device),
+ &ds_layout_info,
+ &device->alloc,
+ ds_layout);
+ if (result != VK_SUCCESS)
+ return false;
+ }
+
+ assert(*p_layout == 0);
+ VkPipelineLayoutCreateInfo p_layout_info = {
+ .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
+ .setLayoutCount = 1,
+ .pSetLayouts = ds_layout,
+ .pushConstantRangeCount = 1,
+ .pPushConstantRanges =
+ &(VkPushConstantRange) { VK_SHADER_STAGE_FRAGMENT_BIT, 0, 20 },
+ };
+
+ result =
+ v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
+ &p_layout_info,
+ &device->alloc,
+ p_layout);
+ return result == VK_SUCCESS;
+}
+
void
v3dv_meta_texel_buffer_copy_init(struct v3dv_device *device)
{
@@ -99,6 +195,11 @@ v3dv_meta_texel_buffer_copy_init(struct v3dv_device *device)
meta_texel_buffer_copy_key_hash,
meta_texel_buffer_copy_key_compare);
}
+
+ create_texel_buffer_copy_pipeline_layout(
+ device,
+ &device->meta.texel_buffer_copy.dslayout,
+ &device->meta.texel_buffer_copy.playout);
}
void
@@ -2572,52 +2673,6 @@ create_tiled_image_from_buffer(struct v3dv_cmd_buffer *cmd_buffer,
return false;
}
-static bool
-create_texel_buffer_copy_pipeline_layout(struct v3dv_device *device,
- VkDescriptorSetLayout *ds_layout,
- VkPipelineLayout *p_layout)
-{
- VkResult result;
-
- if (*ds_layout == 0) {
- VkDescriptorSetLayoutBinding ds_layout_binding = {
- .binding = 0,
- .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER,
- .descriptorCount = 1,
- .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
- };
- VkDescriptorSetLayoutCreateInfo ds_layout_info = {
- .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
- .bindingCount = 1,
- .pBindings = &ds_layout_binding,
- };
- result =
- v3dv_CreateDescriptorSetLayout(v3dv_device_to_handle(device),
- &ds_layout_info,
- &device->alloc,
- ds_layout);
- if (result != VK_SUCCESS)
- return false;
- }
-
- assert(*p_layout == 0);
- VkPipelineLayoutCreateInfo p_layout_info = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
- .setLayoutCount = 1,
- .pSetLayouts = ds_layout,
- .pushConstantRangeCount = 1,
- .pPushConstantRanges =
- &(VkPushConstantRange) { VK_SHADER_STAGE_FRAGMENT_BIT, 0, 20 },
- };
-
- result =
- v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
- &p_layout_info,
- &device->alloc,
- p_layout);
- return result == VK_SUCCESS;
-}
-
static VkResult
create_texel_buffer_copy_descriptor_pool(struct v3dv_cmd_buffer *cmd_buffer)
{
@@ -2938,19 +2993,9 @@ get_copy_texel_buffer_pipeline(
{
bool ok = true;
- mtx_lock(&device->meta.mtx);
- if (!device->meta.texel_buffer_copy.playout) {
- ok = create_texel_buffer_copy_pipeline_layout(
- device,
- &device->meta.texel_buffer_copy.dslayout,
- &device->meta.texel_buffer_copy.playout);
- }
- mtx_unlock(&device->meta.mtx);
- if (!ok)
- return false;
-
uint8_t key[V3DV_META_TEXEL_BUFFER_COPY_CACHE_KEY_SIZE];
get_texel_buffer_copy_pipeline_cache_key(format, key);
+
mtx_lock(&device->meta.mtx);
struct hash_entry *entry =
_mesa_hash_table_search(device->meta.texel_buffer_copy.cache[image_type],
@@ -3912,52 +3957,6 @@ get_blit_pipeline_cache_key(VkFormat dst_format,
assert(((uint8_t*)p - key) == V3DV_META_BLIT_CACHE_KEY_SIZE);
}
-static bool
-create_blit_pipeline_layout(struct v3dv_device *device,
- VkDescriptorSetLayout *descriptor_set_layout,
- VkPipelineLayout *pipeline_layout)
-{
- VkResult result;
-
- if (*descriptor_set_layout == 0) {
- VkDescriptorSetLayoutBinding descriptor_set_layout_binding = {
- .binding = 0,
- .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
- .descriptorCount = 1,
- .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
- };
- VkDescriptorSetLayoutCreateInfo descriptor_set_layout_info = {
- .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
- .bindingCount = 1,
- .pBindings = &descriptor_set_layout_binding,
- };
- result =
- v3dv_CreateDescriptorSetLayout(v3dv_device_to_handle(device),
- &descriptor_set_layout_info,
- &device->alloc,
- descriptor_set_layout);
- if (result != VK_SUCCESS)
- return false;
- }
-
- assert(*pipeline_layout == 0);
- VkPipelineLayoutCreateInfo pipeline_layout_info = {
- .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
- .setLayoutCount = 1,
- .pSetLayouts = descriptor_set_layout,
- .pushConstantRangeCount = 1,
- .pPushConstantRanges =
- &(VkPushConstantRange) { VK_SHADER_STAGE_VERTEX_BIT, 0, 20 },
- };
-
- result =
- v3dv_CreatePipelineLayout(v3dv_device_to_handle(device),
- &pipeline_layout_info,
- &device->alloc,
- pipeline_layout);
- return result == VK_SUCCESS;
-}
-
static bool
create_blit_render_pass(struct v3dv_device *device,
VkFormat dst_format,
@@ -4596,16 +4595,6 @@ get_blit_pipeline(struct v3dv_device *device,
{
bool ok = true;
- mtx_lock(&device->meta.mtx);
- if (!device->meta.blit.playout) {
- ok = create_blit_pipeline_layout(device,
- &device->meta.blit.dslayout,
- &device->meta.blit.playout);
- }
- mtx_unlock(&device->meta.mtx);
- if (!ok)
- return false;
-
uint8_t key[V3DV_META_BLIT_CACHE_KEY_SIZE];
get_blit_pipeline_cache_key(dst_format, src_format, cmask,
dst_samples, src_samples, key);
More information about the mesa-commit
mailing list