The texture and sampler descriptors are well separated in Vulkan,
let's add a new field to allow mixing sampler and texture descs.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9517>
info->attribute_count += util_bitcount(s->info.images_used);
info->writes_global = s->info.writes_memory;
- info->texture_count = s->info.num_textures;
+ info->sampler_count = info->texture_count = s->info.num_textures;
}
rsd->shader.varying_count = shader_info->varyings.input_count +
shader_info->varyings.output_count;
rsd->shader.texture_count = shader_info->texture_count;
- rsd->shader.sampler_count = shader_info->texture_count;
+ rsd->shader.sampler_count = shader_info->sampler_count;
rsd->properties.shader_contains_barrier = shader_info->contains_barrier;
if (shader_info->stage == MESA_SHADER_FRAGMENT) {
bool writes_global;
uint64_t outputs_written;
+ unsigned sampler_count;
unsigned texture_count;
unsigned ubo_count;
unsigned attribute_count;