From c29fd3425987c98a1d650041ed77082995145053 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 10 Oct 2018 21:44:43 -0700 Subject: iris: move images next to textures in binding table --- src/gallium/drivers/iris/iris_program.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gallium/drivers/iris/iris_program.c') diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index b3eea223cc4..56709dae5b4 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -352,6 +352,13 @@ assign_common_binding_table_offsets(const struct gen_device_info *devinfo, prog_data->binding_table.gather_texture_start = 0xd0d0d0d0; } + if (info->num_images) { + prog_data->binding_table.image_start = next_binding_table_offset; + next_binding_table_offset += info->num_images; + } else { + prog_data->binding_table.image_start = 0xd0d0d0d0; + } + int num_ubos = info->num_ubos + (nir->num_uniforms > 0 ? 1 : 0); if (num_ubos) { @@ -372,13 +379,6 @@ assign_common_binding_table_offsets(const struct gen_device_info *devinfo, prog_data->binding_table.shader_time_start = 0xd0d0d0d0; - if (info->num_images) { - prog_data->binding_table.image_start = next_binding_table_offset; - next_binding_table_offset += info->num_images; - } else { - prog_data->binding_table.image_start = 0xd0d0d0d0; - } - /* This may or may not be used depending on how the compile goes. */ prog_data->binding_table.pull_constants_start = next_binding_table_offset; next_binding_table_offset++; -- cgit v1.2.3