radeonsi: remove si_program::use_code_object_v2

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index a48887844aa28c28443a71827e35550438969f11..43616fc22e8a9f8efe45f3f87fd718c5387c33fd 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -61,9 +61,8 @@ static const amd_kernel_code_t *si_compute_get_code_object(
 {
        const struct si_shader_selector *sel = &program->sel;
 
-       if (!program->use_code_object_v2) {
+       if (program->ir_type != PIPE_SHADER_IR_NATIVE)
                return NULL;
-       }
 
        struct ac_rtld_binary rtld;
        if (!ac_rtld_open(&rtld, (struct ac_rtld_open_info){
@@ -228,7 +227,6 @@ static void *si_create_compute_state(
        program->local_size = cso->req_local_mem;
        program->private_size = cso->req_private_mem;
        program->input_size = cso->req_input_mem;
-       program->use_code_object_v2 = cso->ir_type == PIPE_SHADER_IR_NATIVE;
 
        if (cso->ir_type != PIPE_SHADER_IR_NATIVE) {
                if (cso->ir_type == PIPE_SHADER_IR_TGSI) {
@@ -491,7 +489,7 @@ static bool si_switch_compute_shader(struct si_context *sctx,
        }
 
        shader_va = shader->bo->gpu_address + offset;
-       if (program->use_code_object_v2) {
+       if (program->ir_type == PIPE_SHADER_IR_NATIVE) {
                /* Shader code is placed after the amd_kernel_code_t
                 * struct. */
                shader_va += sizeof(amd_kernel_code_t);
@@ -665,7 +663,7 @@ static bool si_upload_compute_input(struct si_context *sctx,
        struct si_compute *program = sctx->cs_shader_state.program;
        struct si_resource *input_buffer = NULL;
        unsigned kernel_args_size;
-       unsigned num_work_size_bytes = program->use_code_object_v2 ? 0 : 36;
+       unsigned num_work_size_bytes = program->ir_type == PIPE_SHADER_IR_NATIVE ? 0 : 36;
        uint32_t kernel_args_offset = 0;
        uint32_t *kernel_args;
        void *kernel_args_ptr;

diff --git a/src/gallium/drivers/radeonsi/si_compute.h b/src/gallium/drivers/radeonsi/si_compute.h
index e0b74397843a3c1b21222699e6717eb7a862bb31..86021178533a5bc66c3c581d489fe3358ff6d480 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.h
+++ b/src/gallium/drivers/radeonsi/si_compute.h
@@ -41,7 +41,6 @@ struct si_compute {
        unsigned input_size;
 
        struct pipe_resource *global_buffers[MAX_GLOBAL_BUFFERS];
-       unsigned use_code_object_v2 : 1;
        bool reads_variable_block_size;
        unsigned num_cs_user_data_dwords;
 };