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

iris: rework num textures to util_lastbit

Browse source
This commit is contained in:
Kenneth Graunke 2019-01-13 11:36:10 -08:00
parent 974229df46
commit 15341778ba
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/iris/iris_program.c
View file

@ -543,10 +543,12 @@ assign_common_binding_table_offsets(const struct gen_device_info *devinfo,
{
const struct shader_info *info = &nir->info;
if (info->num_textures) {
unsigned num_textures = util_last_bit(info->textures_used);
if (num_textures) {
prog_data->binding_table.texture_start = next_binding_table_offset;
prog_data->binding_table.gather_texture_start = next_binding_table_offset;
next_binding_table_offset += info->num_textures;
next_binding_table_offset += num_textures;
} else {
prog_data->binding_table.texture_start = 0xd0d0d0d0;
prog_data->binding_table.gather_texture_start = 0xd0d0d0d0;
@ -581,10 +583,10 @@ assign_common_binding_table_offsets(const struct gen_device_info *devinfo,
prog_data->binding_table.plane_start[0] = prog_data->binding_table.texture_start;
prog_data->binding_table.plane_start[1] = next_binding_table_offset;
next_binding_table_offset += info->num_textures;
next_binding_table_offset += num_textures;
prog_data->binding_table.plane_start[2] = next_binding_table_offset;
next_binding_table_offset += info->num_textures;
next_binding_table_offset += num_textures;
/* Set the binding table size */
prog_data->binding_table.size_bytes = next_binding_table_offset * 4;

6
src/gallium/drivers/iris/iris_state.c
View file

@ -3719,9 +3719,11 @@ iris_populate_binding_table(struct iris_context *ice,
}
}
bt_assert(texture_start, info->num_textures > 0);
unsigned num_textures = util_last_bit(info->textures_used);
for (int i = 0; i < info->num_textures; i++) {
bt_assert(texture_start, num_textures > 0);
for (int i = 0; i < num_textures; i++) {
struct iris_sampler_view *view = shs->textures[i];
uint32_t addr = view ? use_sampler_view(batch, view)
: use_null_surface(batch, ice);