radv/gfx10: fix 3D images

GFX10 does act like GFX9 actually.

This fixes
dEQP-VK.glsl.texture_functions.query.texturesize.*sampler3d_*.

Cc: 19.2 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 1842daabf68ae2ade2e8bb46eeed983f1d3fd4a3..fcdab593937701efd10fd5bf3bebfc92bfe8122d 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -789,7 +789,7 @@ gfx10_make_texture_descriptor(struct radv_device *device,
         */
        state[4] = S_00A010_DEPTH(type == V_008F1C_SQ_RSRC_IMG_3D ? depth - 1 : last_layer) |
                   S_00A010_BASE_ARRAY(first_layer);
-       state[5] = S_00A014_ARRAY_PITCH(!!(type == V_008F1C_SQ_RSRC_IMG_3D)) |
+       state[5] = S_00A014_ARRAY_PITCH(0) |
                   S_00A014_MAX_MIP(image->info.samples > 1 ?
                                    util_logbase2(image->info.samples) :
                                    image->info.levels - 1) |

diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c
index e9aa951ff22fa0c9c771c4aa724fd51903ab1a1c..819941bc8b2a62af7aaf6ba35e992efb541a77d3 100644 (file)
--- a/src/amd/vulkan/radv_meta_blit2d.c
+++ b/src/amd/vulkan/radv_meta_blit2d.c
@@ -408,7 +408,7 @@ radv_meta_blit2d(struct radv_cmd_buffer *cmd_buffer,
                 unsigned num_rects,
                 struct radv_meta_blit2d_rect *rects)
 {
-       bool use_3d = cmd_buffer->device->physical_device->rad_info.chip_class == GFX9 &&
+       bool use_3d = cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9 &&
                (src_img && src_img->image->type == VK_IMAGE_TYPE_3D);
        enum blit2d_src_type src_type = src_buf ? BLIT2D_SRC_TYPE_BUFFER :
                use_3d ? BLIT2D_SRC_TYPE_IMAGE_3D : BLIT2D_SRC_TYPE_IMAGE;
@@ -1308,7 +1308,7 @@ VkResult
 radv_device_init_meta_blit2d_state(struct radv_device *device, bool on_demand)
 {
        VkResult result;
-       bool create_3d = device->physical_device->rad_info.chip_class == GFX9;
+       bool create_3d = device->physical_device->rad_info.chip_class >= GFX9;
 
        for (unsigned log2_samples = 0; log2_samples < MAX_SAMPLES_LOG2; log2_samples++) {
                for (unsigned src = 0; src < BLIT2D_NUM_SRC_TYPES; src++) {

diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c
index 89bb8535b098e2f0e6fa096ef8b2bcb921a00c4f..0994d2ee92cb054d9dbf14df36c7941fd2daa20b 100644 (file)
--- a/src/amd/vulkan/radv_meta_bufimage.c
+++ b/src/amd/vulkan/radv_meta_bufimage.c
@@ -135,7 +135,7 @@ radv_device_init_meta_itob_state(struct radv_device *device)
        struct radv_shader_module cs_3d = { .nir = NULL };
 
        cs.nir = build_nir_itob_compute_shader(device, false);
-       if (device->physical_device->rad_info.chip_class == GFX9)
+       if (device->physical_device->rad_info.chip_class >= GFX9)
                cs_3d.nir = build_nir_itob_compute_shader(device, true);
 
        /*
@@ -211,7 +211,7 @@ radv_device_init_meta_itob_state(struct radv_device *device)
        if (result != VK_SUCCESS)
                goto fail;
 
-       if (device->physical_device->rad_info.chip_class == GFX9) {
+       if (device->physical_device->rad_info.chip_class >= GFX9) {
                VkPipelineShaderStageCreateInfo pipeline_shader_stage_3d = {
                        .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
                        .stage = VK_SHADER_STAGE_COMPUTE_BIT,
@@ -256,7 +256,7 @@ radv_device_finish_meta_itob_state(struct radv_device *device)
                                        &state->alloc);
        radv_DestroyPipeline(radv_device_to_handle(device),
                             state->itob.pipeline, &state->alloc);
-       if (device->physical_device->rad_info.chip_class == GFX9)
+       if (device->physical_device->rad_info.chip_class >= GFX9)
                radv_DestroyPipeline(radv_device_to_handle(device),
                                     state->itob.pipeline_3d, &state->alloc);
 }
@@ -361,7 +361,7 @@ radv_device_init_meta_btoi_state(struct radv_device *device)
        struct radv_shader_module cs = { .nir = NULL };
        struct radv_shader_module cs_3d = { .nir = NULL };
        cs.nir = build_nir_btoi_compute_shader(device, false);
-       if (device->physical_device->rad_info.chip_class == GFX9)
+       if (device->physical_device->rad_info.chip_class >= GFX9)
                cs_3d.nir = build_nir_btoi_compute_shader(device, true);
        /*
         * two descriptors one for the image being sampled
@@ -436,7 +436,7 @@ radv_device_init_meta_btoi_state(struct radv_device *device)
        if (result != VK_SUCCESS)
                goto fail;
 
-       if (device->physical_device->rad_info.chip_class == GFX9) {
+       if (device->physical_device->rad_info.chip_class >= GFX9) {
                VkPipelineShaderStageCreateInfo pipeline_shader_stage_3d = {
                        .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
                        .stage = VK_SHADER_STAGE_COMPUTE_BIT,
@@ -785,7 +785,7 @@ radv_device_init_meta_itoi_state(struct radv_device *device)
        struct radv_shader_module cs = { .nir = NULL };
        struct radv_shader_module cs_3d = { .nir = NULL };
        cs.nir = build_nir_itoi_compute_shader(device, false);
-       if (device->physical_device->rad_info.chip_class == GFX9)
+       if (device->physical_device->rad_info.chip_class >= GFX9)
                cs_3d.nir = build_nir_itoi_compute_shader(device, true);
        /*
         * two descriptors one for the image being sampled
@@ -860,7 +860,7 @@ radv_device_init_meta_itoi_state(struct radv_device *device)
        if (result != VK_SUCCESS)
                goto fail;
 
-       if (device->physical_device->rad_info.chip_class == GFX9) {
+       if (device->physical_device->rad_info.chip_class >= GFX9) {
                VkPipelineShaderStageCreateInfo pipeline_shader_stage_3d = {
                        .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
 .stage = VK_SHADER_STAGE_COMPUTE_BIT,
@@ -904,7 +904,7 @@ radv_device_finish_meta_itoi_state(struct radv_device *device)
                                        &state->alloc);
        radv_DestroyPipeline(radv_device_to_handle(device),
                             state->itoi.pipeline, &state->alloc);
-       if (device->physical_device->rad_info.chip_class == GFX9)
+       if (device->physical_device->rad_info.chip_class >= GFX9)
                radv_DestroyPipeline(radv_device_to_handle(device),
                                     state->itoi.pipeline_3d, &state->alloc);
 }
@@ -1191,7 +1191,7 @@ radv_device_init_meta_cleari_state(struct radv_device *device)
        struct radv_shader_module cs = { .nir = NULL };
        struct radv_shader_module cs_3d = { .nir = NULL };
        cs.nir = build_nir_cleari_compute_shader(device, false);
-       if (device->physical_device->rad_info.chip_class == GFX9)
+       if (device->physical_device->rad_info.chip_class >= GFX9)
                cs_3d.nir = build_nir_cleari_compute_shader(device, true);
 
        /*
@@ -1261,7 +1261,7 @@ radv_device_init_meta_cleari_state(struct radv_device *device)
                goto fail;
 
 
-       if (device->physical_device->rad_info.chip_class == GFX9) {
+       if (device->physical_device->rad_info.chip_class >= GFX9) {
                /* compute shader */
                VkPipelineShaderStageCreateInfo pipeline_shader_stage_3d = {
                        .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
@@ -1706,7 +1706,7 @@ radv_meta_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
        create_bview(cmd_buffer, dst->buffer, dst->offset, dst->format, &dst_view);
        itob_bind_descriptors(cmd_buffer, &src_view, &dst_view);
 
-       if (device->physical_device->rad_info.chip_class == GFX9 &&
+       if (device->physical_device->rad_info.chip_class >= GFX9 &&
            src->image->type == VK_IMAGE_TYPE_3D)
                pipeline = cmd_buffer->device->meta_state.itob.pipeline_3d;
 
@@ -1875,7 +1875,7 @@ radv_meta_buffer_to_image_cs(struct radv_cmd_buffer *cmd_buffer,
        create_iview(cmd_buffer, dst, &dst_view);
        btoi_bind_descriptors(cmd_buffer, &src_view, &dst_view);
 
-       if (device->physical_device->rad_info.chip_class == GFX9 &&
+       if (device->physical_device->rad_info.chip_class >= GFX9 &&
            dst->image->type == VK_IMAGE_TYPE_3D)
                pipeline = cmd_buffer->device->meta_state.btoi.pipeline_3d;
        radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer),
@@ -2060,7 +2060,7 @@ radv_meta_image_to_image_cs(struct radv_cmd_buffer *cmd_buffer,
 
        itoi_bind_descriptors(cmd_buffer, &src_view, &dst_view);
 
-       if (device->physical_device->rad_info.chip_class == GFX9 &&
+       if (device->physical_device->rad_info.chip_class >= GFX9 &&
            (src->image->type == VK_IMAGE_TYPE_3D || dst->image->type == VK_IMAGE_TYPE_3D))
                pipeline = cmd_buffer->device->meta_state.itoi.pipeline_3d;
        radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer),
@@ -2201,7 +2201,7 @@ radv_meta_clear_image_cs(struct radv_cmd_buffer *cmd_buffer,
        create_iview(cmd_buffer, dst, &dst_iview);
        cleari_bind_descriptors(cmd_buffer, &dst_iview);
 
-       if (device->physical_device->rad_info.chip_class == GFX9 &&
+       if (device->physical_device->rad_info.chip_class >= GFX9 &&
            dst->image->type == VK_IMAGE_TYPE_3D)
                pipeline = cmd_buffer->device->meta_state.cleari.pipeline_3d;