compiler: move the glsl_types C wrapper alongside their C++ brethren

At a later stage we might want to split out the NIR specific [XXX:
which one was it], as to make things move obvious and rename the files
appropriately. This patch aims to split it out of nir.

Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Acked-by: Jose Fonseca <[email protected]>

5 files changed, 3 insertions, 283 deletions

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index a3df4c4263d..08b40c5cc8f 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -74,12 +74,10 @@ NIR_FILES = \
 	nir/nir_split_var_copies.c \
 	nir/nir_sweep.c \
 	nir/nir_to_ssa.c \
-	nir/nir_types.h \
 	nir/nir_validate.c \
 	nir/nir_vla.h \
 	nir/nir_worklist.c \
-	nir/nir_worklist.h \
-	nir/nir_types.cpp
+	nir/nir_worklist.h
 
 # libglsl
 
diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index 79b35f7a416..d76df66bb67 100644
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -34,7 +34,7 @@
 #include "util/ralloc.h"
 #include "util/set.h"
 #include "util/bitset.h"
-#include "nir_types.h"
+#include "compiler/nir_types.h"
 #include "compiler/shader_enums.h"
 #include <stdio.h>
 
diff --git a/src/glsl/nir/nir_lower_var_copies.c b/src/glsl/nir/nir_lower_var_copies.c
index 350e99c3423..8cb3edd0a84 100644
--- a/src/glsl/nir/nir_lower_var_copies.c
+++ b/src/glsl/nir/nir_lower_var_copies.c
@@ -26,7 +26,7 @@
  */
 
 #include "nir.h"
-#include "nir_types.h"
+#include "compiler/nir_types.h"
 
 /*
  * Lowers all copy intrinsics to sequences of load/store intrinsics.
diff --git a/src/glsl/nir/nir_types.cpp b/src/glsl/nir/nir_types.cpp
deleted file mode 100644
index 41ac54673d9..00000000000
--- a/src/glsl/nir/nir_types.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright © 2014 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Connor Abbott ([email protected])
- *
- */
-
-#include "nir_types.h"
-#include "ir.h"
-
-void
-glsl_print_type(const glsl_type *type, FILE *fp)
-{
-   if (type->base_type == GLSL_TYPE_ARRAY) {
-      glsl_print_type(type->fields.array, fp);
-      fprintf(fp, "[%u]", type->length);
-   } else if ((type->base_type == GLSL_TYPE_STRUCT)
-              && !is_gl_identifier(type->name)) {
-      fprintf(fp, "%s@%p", type->name, (void *) type);
-   } else {
-      fprintf(fp, "%s", type->name);
-   }
-}
-
-void
-glsl_print_struct(const glsl_type *type, FILE *fp)
-{
-   assert(type->base_type == GLSL_TYPE_STRUCT);
-
-   fprintf(fp, "struct {\n");
-   for (unsigned i = 0; i < type->length; i++) {
-      fprintf(fp, "\t");
-      glsl_print_type(type->fields.structure[i].type, fp);
-      fprintf(fp, " %s;\n", type->fields.structure[i].name);
-   }
-   fprintf(fp, "}\n");
-}
-
-const glsl_type *
-glsl_get_array_element(const glsl_type* type)
-{
-   if (type->is_matrix())
-      return type->column_type();
-   return type->fields.array;
-}
-
-const glsl_type *
-glsl_get_struct_field(const glsl_type *type, unsigned index)
-{
-   return type->fields.structure[index].type;
-}
-
-const struct glsl_type *
-glsl_get_column_type(const struct glsl_type *type)
-{
-   return type->column_type();
-}
-
-enum glsl_base_type
-glsl_get_base_type(const struct glsl_type *type)
-{
-   return type->base_type;
-}
-
-unsigned
-glsl_get_vector_elements(const struct glsl_type *type)
-{
-   return type->vector_elements;
-}
-
-unsigned
-glsl_get_components(const struct glsl_type *type)
-{
-   return type->components();
-}
-
-unsigned
-glsl_get_matrix_columns(const struct glsl_type *type)
-{
-   return type->matrix_columns;
-}
-
-unsigned
-glsl_get_length(const struct glsl_type *type)
-{
-   return type->is_matrix() ? type->matrix_columns : type->length;
-}
-
-unsigned
-glsl_get_aoa_size(const struct glsl_type *type)
-{
-   return type->arrays_of_arrays_size();
-}
-
-const char *
-glsl_get_struct_elem_name(const struct glsl_type *type, unsigned index)
-{
-   return type->fields.structure[index].name;
-}
-
-unsigned
-glsl_get_record_location_offset(const struct glsl_type *type,
-                                unsigned length)
-{
-   return type->record_location_offset(length);
-}
-
-bool
-glsl_type_is_void(const glsl_type *type)
-{
-   return type->is_void();
-}
-
-bool
-glsl_type_is_vector(const struct glsl_type *type)
-{
-   return type->is_vector();
-}
-
-bool
-glsl_type_is_scalar(const struct glsl_type *type)
-{
-   return type->is_scalar();
-}
-
-bool
-glsl_type_is_vector_or_scalar(const struct glsl_type *type)
-{
-   return type->is_vector() || type->is_scalar();
-}
-
-bool
-glsl_type_is_matrix(const struct glsl_type *type)
-{
-   return type->is_matrix();
-}
-
-const glsl_type *
-glsl_void_type(void)
-{
-   return glsl_type::void_type;
-}
-
-const glsl_type *
-glsl_float_type(void)
-{
-   return glsl_type::float_type;
-}
-
-const glsl_type *
-glsl_vec_type(unsigned n)
-{
-   return glsl_type::vec(n);
-}
-
-const glsl_type *
-glsl_vec4_type(void)
-{
-   return glsl_type::vec4_type;
-}
-
-const glsl_type *
-glsl_uint_type(void)
-{
-   return glsl_type::uint_type;
-}
-
-const glsl_type *
-glsl_array_type(const glsl_type *base, unsigned elements)
-{
-   return glsl_type::get_array_instance(base, elements);
-}
diff --git a/src/glsl/nir/nir_types.h b/src/glsl/nir/nir_types.h
deleted file mode 100644
index 197978804cc..00000000000
--- a/src/glsl/nir/nir_types.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright © 2014 Connor Abbott
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Connor Abbott ([email protected])
- *
- */
-
-#pragma once
-
-#include <stdio.h>
-
-/* C wrapper around compiler/glsl_types.h */
-
-#include "compiler/glsl_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#else
-struct glsl_type;
-#endif
-
-void glsl_print_type(const struct glsl_type *type, FILE *fp);
-void glsl_print_struct(const struct glsl_type *type, FILE *fp);
-
-const struct glsl_type *glsl_get_struct_field(const struct glsl_type *type,
-                                              unsigned index);
-
-const struct glsl_type *glsl_get_array_element(const struct glsl_type *type);
-
-const struct glsl_type *glsl_get_column_type(const struct glsl_type *type);
-
-enum glsl_base_type glsl_get_base_type(const struct glsl_type *type);
-
-unsigned glsl_get_vector_elements(const struct glsl_type *type);
-
-unsigned glsl_get_components(const struct glsl_type *type);
-
-unsigned glsl_get_matrix_columns(const struct glsl_type *type);
-
-unsigned glsl_get_length(const struct glsl_type *type);
-
-unsigned glsl_get_aoa_size(const struct glsl_type *type);
-
-const char *glsl_get_struct_elem_name(const struct glsl_type *type,
-                                      unsigned index);
-
-unsigned glsl_get_record_location_offset(const struct glsl_type *type,
-                                         unsigned length);
-
-bool glsl_type_is_void(const struct glsl_type *type);
-bool glsl_type_is_vector(const struct glsl_type *type);
-bool glsl_type_is_scalar(const struct glsl_type *type);
-bool glsl_type_is_vector_or_scalar(const struct glsl_type *type);
-bool glsl_type_is_matrix(const struct glsl_type *type);
-
-const struct glsl_type *glsl_void_type(void);
-const struct glsl_type *glsl_float_type(void);
-const struct glsl_type *glsl_vec_type(unsigned n);
-const struct glsl_type *glsl_vec4_type(void);
-const struct glsl_type *glsl_uint_type(void);
-const struct glsl_type *glsl_array_type(const struct glsl_type *base,
-                                        unsigned elements);
-
-#ifdef __cplusplus
-}
-#endif