summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Makefile.am3
-rw-r--r--src/glsl/Makefile.sources4
-rw-r--r--src/glsl/SConscript2
-rw-r--r--src/glsl/nir/builtin_type_macros.h (renamed from src/glsl/builtin_type_macros.h)0
-rw-r--r--src/glsl/nir/glsl_types.cpp (renamed from src/glsl/glsl_types.cpp)0
-rw-r--r--src/glsl/nir/glsl_types.h (renamed from src/glsl/glsl_types.h)0
-rw-r--r--src/glsl/nir/nir_types.h2
7 files changed, 5 insertions, 6 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 347919b1d0a..437c6a5fbcd 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -148,9 +148,6 @@ libglsl_la_SOURCES = \
libnir_la_SOURCES = \
- glsl_types.cpp \
- builtin_types.cpp \
- glsl_symbol_table.cpp \
$(NIR_FILES) \
$(NIR_GENERATED_FILES)
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 4da64f43873..ca870367640 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -20,6 +20,8 @@ NIR_GENERATED_FILES = \
NIR_FILES = \
nir/glsl_to_nir.cpp \
nir/glsl_to_nir.h \
+ nir/glsl_types.cpp \
+ nir/glsl_types.h \
nir/nir.c \
nir/nir.h \
nir/nir_array.h \
@@ -104,8 +106,6 @@ LIBGLSL_FILES = \
glsl_parser_extras.h \
glsl_symbol_table.cpp \
glsl_symbol_table.h \
- glsl_types.cpp \
- glsl_types.h \
hir_field_selection.cpp \
ir_basic_block.cpp \
ir_basic_block.h \
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 89c603580a5..927cbdcdb78 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -16,6 +16,7 @@ env.Prepend(CPPPATH = [
'#src/gallium/include',
'#src/gallium/auxiliary',
'#src/glsl',
+ '#src/glsl/nir',
'#src/glsl/glcpp',
])
@@ -80,6 +81,7 @@ mesa_objs = env.StaticObject([
'prog_hash_table.c',
'symbol_table.c',
'dummy_errors.c',
+ 'nir/glsl_types.cpp',
])
compiler_objs += mesa_objs
diff --git a/src/glsl/builtin_type_macros.h b/src/glsl/nir/builtin_type_macros.h
index 8e16ae45489..8e16ae45489 100644
--- a/src/glsl/builtin_type_macros.h
+++ b/src/glsl/nir/builtin_type_macros.h
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/nir/glsl_types.cpp
index 1c66dce85c4..1c66dce85c4 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/nir/glsl_types.cpp
diff --git a/src/glsl/glsl_types.h b/src/glsl/nir/glsl_types.h
index 3ec764219de..3ec764219de 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/nir/glsl_types.h
diff --git a/src/glsl/nir/nir_types.h b/src/glsl/nir/nir_types.h
index 009a0fb9918..60d561b25ee 100644
--- a/src/glsl/nir/nir_types.h
+++ b/src/glsl/nir/nir_types.h
@@ -31,7 +31,7 @@
/* C wrapper around glsl_types.h */
-#include "../glsl_types.h"
+#include "glsl_types.h"
#ifdef __cplusplus
extern "C" {