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

panfrost: Split the sampler and texture count

Browse source 
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>
This commit is contained in:
Boris Brezillon 2021-03-05 13:23:09 +01:00 • committed by Marge Bot
parent b0f968cf5c
commit 825b1f9446
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/panfrost/lib/pan_shader.c
View file

@ -234,5 +234,5 @@ pan_shader_compile(const struct panfrost_device *dev,
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;
}

2
src/panfrost/lib/pan_shader.h
View file

@ -176,7 +176,7 @@ pan_shader_prepare_rsd(const struct panfrost_device *dev,
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) {

1
src/panfrost/util/pan_ir.h
View file

@ -186,6 +186,7 @@ struct pan_shader_info {
bool writes_global;
uint64_t outputs_written;
unsigned sampler_count;
unsigned texture_count;
unsigned ubo_count;
unsigned attribute_count;