spirv: Don't bother counting num_images/num_textures
authorCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Tue, 12 Jan 2021 17:21:07 +0000 (09:21 -0800)
committerMarge Bot <eric+marge@anholt.net>
Fri, 29 Jan 2021 23:36:29 +0000 (23:36 +0000)
Not only these are recalculated in nir_shader_gather_info, but
currently they are also counting all the images / textures in the
module instead of in the shader (entrypoint).

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8786>

src/compiler/spirv/vtn_variables.c

index ac5af93..5b286ad 100644 (file)
@@ -1787,14 +1787,6 @@ vtn_create_variable(struct vtn_builder *b, struct vtn_value *val,
       }
       b->shader->info.num_ssbos++;
       break;
-   case vtn_variable_mode_uniform:
-      if (without_array->base_type == vtn_base_type_image) {
-         if (glsl_type_is_image(without_array->glsl_image))
-            b->shader->info.num_images++;
-         else if (glsl_type_is_sampler(without_array->glsl_image))
-            b->shader->info.num_textures++;
-      }
-      break;
    case vtn_variable_mode_push_constant:
       b->shader->num_uniforms =
          glsl_get_explicit_size(without_array->type, false);