fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: drop support for NULL sampler views

Browse source 
not used anymore. It was used when the polygon stipple texture was constant.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Marek Olšák 2016-10-02 15:40:10 +02:00
parent 82e51e8188
commit b523a9ddc5
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -410,10 +410,11 @@ static void si_set_sampler_view(struct si_context *sctx,
struct r600_texture *rtex = (struct r600_texture *)view->texture;
uint32_t *desc = descs->list + slot * 16;
assert(rtex); /* views with texture == NULL aren't supported */
pipe_sampler_view_reference(&views->views[slot], view);
memcpy(desc, rview->state, 8*4);
if (view->texture && view->texture->target != PIPE_BUFFER) {
if (rtex->resource.b.b.target != PIPE_BUFFER) {
bool is_separate_stencil =
rtex->db_compatible &&
rview->is_stencil_sampler;
@ -427,7 +428,7 @@ static void si_set_sampler_view(struct si_context *sctx,
desc);
}
if (view->texture && view->texture->target != PIPE_BUFFER &&
if (rtex->resource.b.b.target != PIPE_BUFFER &&
rtex->fmask.size) {
memcpy(desc + 8,
rview->fmask_state, 8*4);

11
src/gallium/drivers/radeonsi/si_state.c
View file

@ -2950,16 +2950,7 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
view->base.reference.count = 1;
view->base.context = ctx;
/* NULL resource, obey swizzle (only ZERO and ONE make sense). */
if (!texture) {
view->state[3] = S_008F1C_DST_SEL_X(si_map_swizzle(state->swizzle_r)) |
S_008F1C_DST_SEL_Y(si_map_swizzle(state->swizzle_g)) |
S_008F1C_DST_SEL_Z(si_map_swizzle(state->swizzle_b)) |
S_008F1C_DST_SEL_W(si_map_swizzle(state->swizzle_a)) |
S_008F1C_TYPE(V_008F1C_SQ_RSRC_IMG_1D);
return &view->base;
}
assert(texture);
pipe_resource_reference(&view->base.texture, texture);
if (state->format == PIPE_FORMAT_X24S8_UINT ||