radv: do not need to double zero-init the meta state structures

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c
index 2c1a13228d29368a1224735db50aae500ee44625..7d9f7f902638145346f1223d2261061854629a8e 100644 (file)
--- a/src/amd/vulkan/radv_meta_blit.c
+++ b/src/amd/vulkan/radv_meta_blit.c
@@ -1210,7 +1210,6 @@ radv_device_init_meta_blit_state(struct radv_device *device)
 {
        VkResult result;
        struct radv_shader_module vs = {0};
-       zero(device->meta_state.blit);
 
        VkDescriptorSetLayoutCreateInfo ds_layout_info = {
                .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,

diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c
index f7809b448610fe658182b368384a1ec3ae40b190..751f5914fcef67c0e82bd50b3bdf3a5591625864 100644 (file)
--- a/src/amd/vulkan/radv_meta_blit2d.c
+++ b/src/amd/vulkan/radv_meta_blit2d.c
@@ -1136,8 +1136,6 @@ radv_device_init_meta_blit2d_state(struct radv_device *device)
 {
        VkResult result;
 
-       zero(device->meta_state.blit2d);
-
        const VkPushConstantRange push_constant_ranges[] = {
                {VK_SHADER_STAGE_VERTEX_BIT, 0, 16},
                {VK_SHADER_STAGE_FRAGMENT_BIT, 16, 4},

diff --git a/src/amd/vulkan/radv_meta_buffer.c b/src/amd/vulkan/radv_meta_buffer.c
index 14f848664c2c9f47f15f17c87ca3e31266ab53b4..f95d8823fcc476a9c6b1c06259a0a85750c62272 100644 (file)
--- a/src/amd/vulkan/radv_meta_buffer.c
+++ b/src/amd/vulkan/radv_meta_buffer.c
@@ -121,8 +121,6 @@ VkResult radv_device_init_meta_buffer_state(struct radv_device *device)
        struct radv_shader_module fill_cs = { .nir = NULL };
        struct radv_shader_module copy_cs = { .nir = NULL };
 
-       zero(device->meta_state.buffer);
-
        fill_cs.nir = build_buffer_fill_shader(device);
        copy_cs.nir = build_buffer_copy_shader(device);
 

diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c
index b460143df2e9a8926756be8f70cc778ed2767723..d73420aef9c5681329b81b81b2809c24136ed729 100644 (file)
--- a/src/amd/vulkan/radv_meta_bufimage.c
+++ b/src/amd/vulkan/radv_meta_bufimage.c
@@ -127,8 +127,6 @@ radv_device_init_meta_itob_state(struct radv_device *device)
        VkResult result;
        struct radv_shader_module cs = { .nir = NULL };
 
-       zero(device->meta_state.itob);
-
        cs.nir = build_nir_itob_compute_shader(device);
 
        /*
@@ -327,8 +325,6 @@ radv_device_init_meta_btoi_state(struct radv_device *device)
        VkResult result;
        struct radv_shader_module cs = { .nir = NULL };
 
-       zero(device->meta_state.btoi);
-
        cs.nir = build_nir_btoi_compute_shader(device);
 
        /*
@@ -521,8 +517,6 @@ radv_device_init_meta_itoi_state(struct radv_device *device)
        VkResult result;
        struct radv_shader_module cs = { .nir = NULL };
 
-       zero(device->meta_state.itoi);
-
        cs.nir = build_nir_itoi_compute_shader(device);
 
        /*
@@ -677,8 +671,6 @@ radv_device_init_meta_cleari_state(struct radv_device *device)
        VkResult result;
        struct radv_shader_module cs = { .nir = NULL };
 
-       zero(device->meta_state.cleari);
-
        cs.nir = build_nir_cleari_compute_shader(device);
 
        /*

diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
index 7ca4bc3492006174cbab1932901c93eb10c77733..3317debd8785335ff072c9a3ca4b7eb34507546e 100644 (file)
--- a/src/amd/vulkan/radv_meta_clear.c
+++ b/src/amd/vulkan/radv_meta_clear.c
@@ -768,8 +768,6 @@ radv_device_init_meta_clear_state(struct radv_device *device)
        VkResult res;
        struct radv_meta_state *state = &device->meta_state;
 
-       memset(&device->meta_state.clear, 0, sizeof(device->meta_state.clear));
-
        VkPipelineLayoutCreateInfo pl_color_create_info = {
                .sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
                .setLayoutCount = 0,

diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c
index 1a1a5612e2b611fef7d7982ee13438d0652f7266..23bc2e6dfd4c7fd92e26796b17036690550fe4fa 100644 (file)
--- a/src/amd/vulkan/radv_meta_decompress.c
+++ b/src/amd/vulkan/radv_meta_decompress.c
@@ -232,8 +232,6 @@ radv_device_init_meta_depth_decomp_state(struct radv_device *device)
        struct radv_meta_state *state = &device->meta_state;
        VkResult res = VK_SUCCESS;
 
-       zero(state->depth_decomp);
-
        struct radv_shader_module vs_module = { .nir = radv_meta_build_nir_vs_generate_vertices() };
        if (!vs_module.nir) {
                /* XXX: Need more accurate error */

diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c
index b92fb7cd5ad32f8ef1e9b88378441c485527a931..e006c721a80bb613c3b23d6904aa02d7345796ce 100644 (file)
--- a/src/amd/vulkan/radv_meta_fast_clear.c
+++ b/src/amd/vulkan/radv_meta_fast_clear.c
@@ -266,8 +266,6 @@ radv_device_init_meta_fast_clear_flush_state(struct radv_device *device)
 {
        VkResult res = VK_SUCCESS;
 
-       zero(device->meta_state.fast_clear_flush);
-
        struct radv_shader_module vs_module = { .nir = radv_meta_build_nir_vs_generate_vertices() };
        if (!vs_module.nir) {
                /* XXX: Need more accurate error */

diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c
index dd811c2514282357d6e7f2d9e300531462809dce..80b44c89e97def72cd2f5fc6bba88bc953fef186 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve.c
+++ b/src/amd/vulkan/radv_meta_resolve.c
@@ -238,8 +238,6 @@ radv_device_init_meta_resolve_state(struct radv_device *device)
 {
        VkResult res = VK_SUCCESS;
 
-       zero(device->meta_state.resolve);
-
        struct radv_shader_module vs_module = { .nir = radv_meta_build_nir_vs_generate_vertices() };
        if (!vs_module.nir) {
                /* XXX: Need more accurate error */

diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c
index 05a212b6d93e0d77586bd4fd4e26d52ea0f9ab5c..55bf72071e837e5d3eeff3e50175091234410e6e 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_cs.c
+++ b/src/amd/vulkan/radv_meta_resolve_cs.c
@@ -250,7 +250,6 @@ radv_device_init_meta_resolve_compute_state(struct radv_device *device)
 {
        struct radv_meta_state *state = &device->meta_state;
        VkResult res;
-       memset(&device->meta_state.resolve_compute, 0, sizeof(device->meta_state.resolve_compute));
 
        res = create_layout(device);
        if (res != VK_SUCCESS)

diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c
index 373dd9665a75efb4a0d665f22abd7b41017db73d..50d5ed7d5aa699e9546d4b6bbe4b477908d32940 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_fs.c
+++ b/src/amd/vulkan/radv_meta_resolve_fs.c
@@ -332,9 +332,7 @@ fail:
 VkResult
 radv_device_init_meta_resolve_fragment_state(struct radv_device *device)
 {
-       struct radv_meta_state *state = &device->meta_state;
        VkResult res;
-       memset(&state->resolve_fragment, 0, sizeof(state->resolve_fragment));
 
        res = create_layout(device);
        if (res != VK_SUCCESS)

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 73a9a328be3c1a806c46c682028328d01db81d62..93898a6ad1329b7b8f843b42cea7fb5ac844e273 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -197,8 +197,6 @@ radv_clear_mask(uint32_t *inout_mask, uint32_t clear_mask)
                        memcpy((dest), (src), (count) * sizeof(*(src))); \
                })
 
-#define zero(x) (memset(&(x), 0, sizeof(x)))
-
 /* Whenever we generate an error, pass it through this function. Useful for
  * debugging, where we can break on it. Only call at error site, not when
  * propagating errors. Might be useful to plug in a stack trace here.

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index f63497a4457d64535f2e9968790aa9c70c4aa2f2..40faf22b082be103e19890c53514c980a258d4f3 100644 (file)
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -519,8 +519,6 @@ VkResult radv_device_init_meta_query_state(struct radv_device *device)
        struct radv_shader_module occlusion_cs = { .nir = NULL };
        struct radv_shader_module pipeline_statistics_cs = { .nir = NULL };
 
-       zero(device->meta_state.query);
-
        occlusion_cs.nir = build_occlusion_query_shader(device);
        pipeline_statistics_cs.nir = build_pipeline_statistics_query_shader(device);