fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 20:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: more accurately set {Sampled,Image}1D caps

Browse source 
We don't really need to set this for every shader that uses textures,
only the ones that use 1D textures.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17734>
This commit is contained in:
Erik Faye-Lund 2022-07-25 14:46:47 +02:00 • committed by Marge Bot
parent a923b1636d
commit 6aeb93d555
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -871,6 +871,13 @@ get_bare_image_type(struct ntv_context *ctx, struct nir_variable *var, bool is_s
}
SpvDim dimension = type_to_dim(glsl_get_sampler_dim(type), &is_ms);
if (dimension == SpvDim1D) {
if (is_sampler)
spirv_builder_emit_cap(&ctx->builder, SpvCapabilitySampled1D);
else
spirv_builder_emit_cap(&ctx->builder, SpvCapabilityImage1D);
}
bool arrayed = glsl_sampler_type_is_array(type);
if (dimension == SpvDimCube && arrayed)
spirv_builder_emit_cap(&ctx->builder, SpvCapabilityImageCubeArray);
@ -4180,15 +4187,11 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityMultiViewport);
}
if (s->info.num_textures) {
spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySampled1D);
if (s->info.num_textures)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImageQuery);
}
if (s->info.num_images) {
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImage1D);
if (s->info.num_images)
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImageQuery);
}
ctx.stage = s->info.stage;
ctx.sinfo = sinfo;