Re: [Mesa-dev] [PATCH v2 01/32] glsl: move shader_cache type handling to glsl_types

[Timothy Arceri]

Reviewed-by: Timothy Arceri 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH v2 01/32] glsl: move shader_cache type handling to glsl_types

[Jordan Justen]

From: Connor Abbott 

Not sure if this is the best place to put it, but we're going to need
this for NIR too.
---
 src/compiler/glsl/shader_cache.cpp | 171 -
 src/compiler/glsl_types.cpp| 171 +
 src/compiler/glsl_types.h  |   7 ++
 3 files changed, 178 insertions(+), 171 deletions(-)

diff --git a/src/compiler/glsl/shader_cache.cpp 
b/src/compiler/glsl/shader_cache.cpp
index f3c7a57699..ca90cfde35 100644
--- a/src/compiler/glsl/shader_cache.cpp
+++ b/src/compiler/glsl/shader_cache.cpp
@@ -74,177 +74,6 @@ compile_shaders(struct gl_context *ctx, struct 
gl_shader_program *prog) {
}
 }
 
-static void
-get_struct_type_field_and_pointer_sizes(size_t *s_field_size,
-size_t *s_field_ptrs)
-{
-   *s_field_size = sizeof(glsl_struct_field);
-   *s_field_ptrs =
- sizeof(((glsl_struct_field *)0)->type) +
- sizeof(((glsl_struct_field *)0)->name);
-}
-
-static void
-encode_type_to_blob(struct blob *blob, const glsl_type *type)
-{
-   uint32_t encoding;
-
-   if (!type) {
-  blob_write_uint32(blob, 0);
-  return;
-   }
-
-   switch (type->base_type) {
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_BOOL:
-   case GLSL_TYPE_DOUBLE:
-   case GLSL_TYPE_UINT64:
-   case GLSL_TYPE_INT64:
-  encoding = (type->base_type << 24) |
- (type->vector_elements << 4) |
- (type->matrix_columns);
-  break;
-   case GLSL_TYPE_SAMPLER:
-  encoding = (type->base_type) << 24 |
- (type->sampler_dimensionality << 4) |
- (type->sampler_shadow << 3) |
- (type->sampler_array << 2) |
- (type->sampled_type);
-  break;
-   case GLSL_TYPE_SUBROUTINE:
-  encoding = type->base_type << 24;
-  blob_write_uint32(blob, encoding);
-  blob_write_string(blob, type->name);
-  return;
-   case GLSL_TYPE_IMAGE:
-  encoding = (type->base_type) << 24 |
- (type->sampler_dimensionality << 3) |
- (type->sampler_array << 2) |
- (type->sampled_type);
-  break;
-   case GLSL_TYPE_ATOMIC_UINT:
-  encoding = (type->base_type << 24);
-  break;
-   case GLSL_TYPE_ARRAY:
-  blob_write_uint32(blob, (type->base_type) << 24);
-  blob_write_uint32(blob, type->length);
-  encode_type_to_blob(blob, type->fields.array);
-  return;
-   case GLSL_TYPE_STRUCT:
-   case GLSL_TYPE_INTERFACE:
-  blob_write_uint32(blob, (type->base_type) << 24);
-  blob_write_string(blob, type->name);
-  blob_write_uint32(blob, type->length);
-
-  size_t s_field_size, s_field_ptrs;
-  get_struct_type_field_and_pointer_sizes(_field_size, _field_ptrs);
-
-  for (unsigned i = 0; i < type->length; i++) {
- encode_type_to_blob(blob, type->fields.structure[i].type);
- blob_write_string(blob, type->fields.structure[i].name);
-
- /* Write the struct field skipping the pointers */
- blob_write_bytes(blob,
-  ((char *)>fields.structure[i]) + s_field_ptrs,
-  s_field_size - s_field_ptrs);
-  }
-
-  if (type->is_interface()) {
- blob_write_uint32(blob, type->interface_packing);
- blob_write_uint32(blob, type->interface_row_major);
-  }
-  return;
-   case GLSL_TYPE_VOID:
-   case GLSL_TYPE_ERROR:
-   default:
-  assert(!"Cannot encode type!");
-  encoding = 0;
-  break;
-   }
-
-   blob_write_uint32(blob, encoding);
-}
-
-static const glsl_type *
-decode_type_from_blob(struct blob_reader *blob)
-{
-   uint32_t u = blob_read_uint32(blob);
-
-   if (u == 0) {
-  return NULL;
-   }
-
-   glsl_base_type base_type = (glsl_base_type) (u >> 24);
-
-   switch (base_type) {
-   case GLSL_TYPE_UINT:
-   case GLSL_TYPE_INT:
-   case GLSL_TYPE_FLOAT:
-   case GLSL_TYPE_BOOL:
-   case GLSL_TYPE_DOUBLE:
-   case GLSL_TYPE_UINT64:
-   case GLSL_TYPE_INT64:
-  return glsl_type::get_instance(base_type, (u >> 4) & 0x0f, u & 0x0f);
-   case GLSL_TYPE_SAMPLER:
-  return glsl_type::get_sampler_instance((enum glsl_sampler_dim) ((u >> 4) 
& 0x07),
- (u >> 3) & 0x01,
- (u >> 2) & 0x01,
- (glsl_base_type) ((u >> 0) & 
0x03));
-   case GLSL_TYPE_SUBROUTINE:
-  return glsl_type::get_subroutine_instance(blob_read_string(blob));
-   case GLSL_TYPE_IMAGE:
-  return glsl_type::get_image_instance((enum glsl_sampler_dim) ((u >> 3) & 
0x07),
- (u >> 2) & 0x01,
- (glsl_base_type) ((u >> 0) & 
0x03));
-   case GLSL_TYPE_ATOMIC_UINT:
-  return glsl_type::atomic_uint_type;
-   case GLSL_TYPE_ARRAY: {
-  unsigned length = blob_read_uint32(blob);
-  return glsl_type::get_array_instance(decode_type_from_blob(blob),
-