Parcourir la source

radeonsi: remove wrappers si_decompress_xx_textures

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
tags/17.3-branchpoint
Marek Olšák il y a 8 ans
Parent
révision
de810f8b84

+ 1
- 11
src/gallium/drivers/radeonsi/si_blit.c Voir le fichier

@@ -771,7 +771,7 @@ static void si_decompress_resident_images(struct si_context *sctx)
}
}

static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
{
unsigned compressed_colortex_counter, mask;

@@ -816,16 +816,6 @@ static void si_decompress_textures(struct si_context *sctx, unsigned shader_mask
si_check_render_feedback(sctx);
}

void si_decompress_graphics_textures(struct si_context *sctx)
{
si_decompress_textures(sctx, u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS));
}

void si_decompress_compute_textures(struct si_context *sctx)
{
si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE);
}

static void si_clear(struct pipe_context *ctx, unsigned buffers,
const union pipe_color_union *color,
double depth, unsigned stencil)

+ 1
- 1
src/gallium/drivers/radeonsi/si_compute.c Voir le fichier

@@ -787,7 +787,7 @@ static void si_launch_grid(
sctx->b.last_num_draw_calls = sctx->b.num_draw_calls;
}

si_decompress_compute_textures(sctx);
si_decompress_textures(sctx, 1 << PIPE_SHADER_COMPUTE);

/* Add buffer sizes for memory checking in need_cs_space. */
r600_context_add_resource_size(ctx, &program->shader.bo->b.b);

+ 1
- 2
src/gallium/drivers/radeonsi/si_pipe.h Voir le fichier

@@ -505,8 +505,7 @@ void cik_init_sdma_functions(struct si_context *sctx);

/* si_blit.c */
void si_init_blit_functions(struct si_context *sctx);
void si_decompress_graphics_textures(struct si_context *sctx);
void si_decompress_compute_textures(struct si_context *sctx);
void si_decompress_textures(struct si_context *sctx, unsigned shader_mask);
void si_resource_copy_region(struct pipe_context *ctx,
struct pipe_resource *dst,
unsigned dst_level,

+ 1
- 1
src/gallium/drivers/radeonsi/si_state_draw.c Voir le fichier

@@ -1240,7 +1240,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
si_update_all_texture_descriptors(sctx);
}

si_decompress_graphics_textures(sctx);
si_decompress_textures(sctx, u_bit_consecutive(0, SI_NUM_GRAPHICS_SHADERS));

/* Set the rasterization primitive type.
*

Chargement…
Annuler
Enregistrer