diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c index a2e907724d5..85af4a2f2a8 100644 --- a/src/gallium/drivers/radeonsi/si_gfx_cs.c +++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c @@ -268,10 +268,6 @@ static void si_begin_gfx_cs_debug(struct si_context *ctx) RADEON_USAGE_READWRITE | RADEON_PRIO_FENCE_TRACE); } -static void si_add_gds_to_buffer_list(struct si_context *sctx) -{ -} - void si_set_tracked_regs_to_clear_state(struct si_context *ctx) { assert(ctx->gfx_level < GFX12); diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 7136f79ca39..e8b4a3e3f84 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -2026,11 +2026,6 @@ static inline bool util_prim_is_lines(unsigned prim) return ((1 << prim) & UTIL_ALL_PRIM_LINE_MODES) != 0; } -static inline bool util_prim_is_points_or_lines(unsigned prim) -{ - return ((1 << prim) & (UTIL_ALL_PRIM_LINE_MODES | (1 << MESA_PRIM_POINTS))) != 0; -} - static inline bool util_rast_prim_is_triangles(unsigned prim) { return ((1 << prim) & UTIL_ALL_PRIM_TRIANGLE_MODES) != 0; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 4544d07d036..fd66b895c32 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2200,15 +2200,6 @@ static uint32_t si_translate_buffer_dataformat(struct pipe_screen *screen, return ac_translate_buffer_dataformat(desc, first_non_void); } -static uint32_t si_translate_buffer_numformat(struct pipe_screen *screen, - const struct util_format_description *desc, - int first_non_void) -{ - assert(((struct si_screen *)screen)->info.gfx_level <= GFX9); - - return ac_translate_buffer_numformat(desc, first_non_void); -} - static unsigned si_is_vertex_format_supported(struct pipe_screen *screen, enum pipe_format format, unsigned usage) { @@ -4231,11 +4222,6 @@ static uint32_t si_translate_border_color(struct si_context *sctx, return V_008F3C_SQ_TEX_BORDER_COLOR_REGISTER; } -static inline int S_FIXED(float value, unsigned frac_bits) -{ - return value * (1 << frac_bits); -} - static inline unsigned si_tex_filter(unsigned filter, unsigned max_aniso) { if (filter == PIPE_TEX_FILTER_LINEAR) @@ -4992,26 +4978,6 @@ static void si_write_harvested_raster_configs(struct si_context *sctx, struct si } } -static void si_set_raster_config(struct si_context *sctx, struct si_pm4_state *pm4) -{ - struct si_screen *sscreen = sctx->screen; - unsigned num_rb = MIN2(sscreen->info.max_render_backends, 16); - uint64_t rb_mask = sscreen->info.enabled_rb_mask; - unsigned raster_config = sscreen->pa_sc_raster_config; - unsigned raster_config_1 = sscreen->pa_sc_raster_config_1; - - if (!rb_mask || util_bitcount64(rb_mask) >= num_rb) { - /* Always use the default config when all backends are enabled - * (or when we failed to determine the enabled backends). - */ - ac_pm4_set_reg(&pm4->base, R_028350_PA_SC_RASTER_CONFIG, raster_config); - if (sctx->gfx_level >= GFX7) - ac_pm4_set_reg(&pm4->base, R_028354_PA_SC_RASTER_CONFIG_1, raster_config_1); - } else { - si_write_harvested_raster_configs(sctx, pm4, raster_config, raster_config_1); - } -} - static void si_init_compute_preamble_state(struct si_context *sctx, struct si_pm4_state *pm4) { diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c index 243a819c58a..62f4c48b253 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_cs.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_cs.c @@ -168,14 +168,6 @@ static void radeon_destroy_cs_context(struct radeon_winsys *rws, struct radeon_c FREE(csc->relocs); } - -static enum amd_ip_type radeon_drm_cs_get_ip_type(struct radeon_cmdbuf *rcs) -{ - struct radeon_drm_cs *cs = radeon_drm_cs(rcs); - return cs->ip_type; -} - - static bool radeon_drm_cs_create(struct radeon_cmdbuf *rcs, struct radeon_winsys_ctx *ctx, @@ -221,13 +213,6 @@ radeon_drm_cs_create(struct radeon_cmdbuf *rcs, return true; } -static void radeon_drm_cs_set_preamble(struct radeon_cmdbuf *cs, const uint32_t *preamble_ib, - unsigned preamble_num_dw, bool preamble_changed) -{ - /* The radeon kernel driver doesn't support preambles. */ - radeon_emit_array(cs, preamble_ib, preamble_num_dw); -} - int radeon_lookup_buffer(struct radeon_winsys *rws, struct radeon_cs_context *csc, struct radeon_bo *bo) {