From 094ab8bc12f5cd63337c1eee34ccbd22037ac964 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 18 Dec 2020 15:48:05 +0100 Subject: [PATCH] radeonsi: fix redundant initializations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://gitlab.freedesktop.org/mesa/mesa/-/issues/3966 Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeon/radeon_vce_52.c | 2 -- src/gallium/drivers/radeonsi/si_debug.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_vce_52.c b/src/gallium/drivers/radeon/radeon_vce_52.c index 2ad7d8343d3..ea1ccec00b8 100644 --- a/src/gallium/drivers/radeon/radeon_vce_52.c +++ b/src/gallium/drivers/radeon/radeon_vce_52.c @@ -107,8 +107,6 @@ static void get_pic_control_param(struct rvce_encoder *enc, struct pipe_h264_enc enc->enc_pic.pc.enc_num_default_active_ref_l1 = 0x00000001; enc->enc_pic.pc.enc_cabac_enable = pic->pic_ctrl.enc_cabac_enable; enc->enc_pic.pc.enc_constraint_set_flags = pic->pic_ctrl.enc_constraint_set_flags; - enc->enc_pic.pc.enc_num_default_active_ref_l0 = 0x00000001; - enc->enc_pic.pc.enc_num_default_active_ref_l1 = 0x00000001; } static void get_task_info_param(struct rvce_encoder *enc) diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 2f3800f260a..71db7f81271 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -796,8 +796,6 @@ static void si_dump_descriptors(struct si_context *sctx, gl_shader_stage stage, } else { enabled_constbuf = sctx->const_and_shader_buffers[processor].enabled_mask >> SI_NUM_SHADER_BUFFERS; - enabled_shaderbuf = sctx->const_and_shader_buffers[processor].enabled_mask & - u_bit_consecutive64(0, SI_NUM_SHADER_BUFFERS); enabled_shaderbuf = 0; for (int i = 0; i < SI_NUM_SHADER_BUFFERS; i++) { enabled_shaderbuf |=