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 <emil.velikov@collabora.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index 38e75cf..e1228ca 100644 (file)
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -2,5 +2,7 @@ LIBCOMPILER_FILES = \
        builtin_type_macros.h \
        glsl_types.cpp \
        glsl_types.h \
+       nir_types.cpp \
+       nir_types.h \
        shader_enums.c \
        shader_enums.h

diff --git a/src/glsl/nir/nir_types.cpp b/src/compiler/nir_types.cpp
similarity index 99%
rename from src/glsl/nir/nir_types.cpp
rename to src/compiler/nir_types.cpp
index 41ac546..ddc43be 100644 (file)
--- a/src/glsl/nir/nir_types.cpp
+++ b/src/compiler/nir_types.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "nir_types.h"
-#include "ir.h"
+#include "glsl/ir.h"
 
 void
 glsl_print_type(const glsl_type *type, FILE *fp)

diff --git a/src/glsl/nir/nir_types.h b/src/compiler/nir_types.h
similarity index 98%
rename from src/glsl/nir/nir_types.h
rename to src/compiler/nir_types.h
index 1979788..32fc766 100644 (file)
--- a/src/glsl/nir/nir_types.h
+++ b/src/compiler/nir_types.h
@@ -28,10 +28,11 @@
 #pragma once
 
 #include <stdio.h>
+#include <stdbool.h>
 
 /* C wrapper around compiler/glsl_types.h */
 
-#include "compiler/glsl_types.h"
+#include "glsl_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index a3df4c4..08b40c5 100644 (file)
--- 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 79b35f7..d76df66 100644 (file)
--- 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 350e99c..8cb3edd 100644 (file)
--- 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.