diff options
| author | Alyssa Rosenzweig <alyssa@collabora.com> | 2023-03-30 13:24:16 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-07 01:15:41 +0000 |
| commit | 6ba29d37c8b0b332b3cf9ea12db3621033001e3e (patch) | |
| tree | 2c0fc0ef7e4ac60e20281a8faa0248d61fd37083 /src/mesa | |
| parent | e406e74aa4a53ce13780a40c9ce96cf2a664fd14 (diff) | |
| download | mesa-6ba29d37c8b0b332b3cf9ea12db3621033001e3e.tar.gz | |
gallium: Remove PIPE_CAP_TEXTURE_BUFFER_SAMPLER
No more users. It was already not respected by rusticl so you couldn't set it if
you wanted OpenCL support. I regret introducing the CAP in the first place, and
no more drivers should use it.
Reverts d5d3f77e4ac ("gallium: Add new cap PIPE_CAP_TEXTURE_BUFFER_SAMPLER").
Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22223>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_atom_shader.c | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.h | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 826c42dfa5f..bedd223d84f 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -237,8 +237,7 @@ update_shader_samplers(struct st_context *st, * states that are NULL. */ if (samplers_used & 1 && - (ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER || - st->texture_buffer_sampler)) { + (ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER)) { st_convert_sampler_from_unit( st, sampler, tex_unit, prog->shader_program && prog->shader_program->GLSL_Version >= 130); diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index 643a3739c04..4bb24339595 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -85,8 +85,7 @@ update_gl_clamp(struct st_context *st, struct gl_program *prog, uint32_t *gl_cla for (unit = 0; samplers_used; unit++, samplers_used >>= 1) { unsigned tex_unit = prog->SamplerUnits[unit]; if (samplers_used & 1 && - (st->ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER || - st->texture_buffer_sampler)) { + (st->ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER)) { ASSERTED const struct gl_texture_object *texobj; struct gl_context *ctx = st->ctx; const struct gl_sampler_object *msamp; diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index e7f0a2ef82d..0aba174fa22 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -600,8 +600,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe, PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_ALPHA_NOT_W); st->emulate_gl_clamp = !screen->get_param(screen, PIPE_CAP_GL_CLAMP); - st->texture_buffer_sampler = - screen->get_param(screen, PIPE_CAP_TEXTURE_BUFFER_SAMPLER); st->has_time_elapsed = screen->get_param(screen, PIPE_CAP_QUERY_TIME_ELAPSED); st->has_half_float_packing = diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index ce7d2fd73d6..031ba1070a3 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -202,7 +202,6 @@ struct st_context boolean use_format_with_border_color; boolean alpha_border_color_is_not_w; boolean emulate_gl_clamp; - boolean texture_buffer_sampler; boolean draw_needs_minmax_index; boolean has_hw_atomics; |