summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAras Pranckevicius <aras@unity3d.com>2010-07-29 12:40:49 +0300
committerEric Anholt <eric@anholt.net>2010-08-02 10:59:46 -0700
commit31747155ea3a24190277b125bd188ac8689af719 (patch)
tree7b93cf0e0431c51ab6e49c0de22cbbb8fd3339fc /src
parentb35703df107b50b2c3f5cd4d56790921e8106324 (diff)
glsl2: Give the path within src/mesa/ for headers instead of relying on -I.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ast_type.cpp2
-rw-r--r--src/glsl/glcpp/glcpp.h2
-rw-r--r--src/glsl/glsl_types.cpp2
-rw-r--r--src/glsl/hir_field_selection.cpp2
-rw-r--r--src/glsl/ir_clone.cpp2
-rw-r--r--src/glsl/ir_function_inlining.cpp2
-rw-r--r--src/glsl/ir_validate.cpp2
-rw-r--r--src/glsl/link_functions.cpp2
-rw-r--r--src/glsl/linker.cpp2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index e2510a10c6..9a957044e7 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -24,7 +24,7 @@
#include <cstdio>
#include "ast.h"
extern "C" {
-#include "symbol_table.h"
+#include "program/symbol_table.h"
}
void
diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
index 869de2efbc..0ccd957eda 100644
--- a/src/glsl/glcpp/glcpp.h
+++ b/src/glsl/glcpp/glcpp.h
@@ -28,7 +28,7 @@
#include <talloc.h>
-#include "hash_table.h"
+#include "program/hash_table.h"
#define yyscan_t void*
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 8192b86dfc..ce47b8167f 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -28,7 +28,7 @@
#include "glsl_types.h"
#include "builtin_types.h"
extern "C" {
-#include "hash_table.h"
+#include "program/hash_table.h"
}
hash_table *glsl_type::array_types = NULL;
diff --git a/src/glsl/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
index db1e06932f..6dd910d581 100644
--- a/src/glsl/hir_field_selection.cpp
+++ b/src/glsl/hir_field_selection.cpp
@@ -23,7 +23,7 @@
#include "ir.h"
#include "main/imports.h"
-#include "symbol_table.h"
+#include "program/symbol_table.h"
#include "glsl_parser_extras.h"
#include "ast.h"
#include "glsl_types.h"
diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
index 6be3e59a95..5ea3a79afc 100644
--- a/src/glsl/ir_clone.cpp
+++ b/src/glsl/ir_clone.cpp
@@ -25,7 +25,7 @@
#include "ir.h"
#include "glsl_types.h"
extern "C" {
-#include "hash_table.h"
+#include "program/hash_table.h"
}
/**
diff --git a/src/glsl/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
index 77c264f288..9599306243 100644
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
@@ -33,7 +33,7 @@
#include "ir_function_inlining.h"
#include "ir_expression_flattening.h"
#include "glsl_types.h"
-#include "hash_table.h"
+#include "program/hash_table.h"
class ir_function_inlining_visitor : public ir_hierarchical_visitor {
public:
diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 1fa6e19ce9..85417a1dbc 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -36,7 +36,7 @@
#include <inttypes.h>
#include "ir.h"
#include "ir_hierarchical_visitor.h"
-#include "hash_table.h"
+#include "program/hash_table.h"
#include "glsl_types.h"
class ir_validate : public ir_hierarchical_visitor {
diff --git a/src/glsl/link_functions.cpp b/src/glsl/link_functions.cpp
index 327be73afe..fdf886f662 100644
--- a/src/glsl/link_functions.cpp
+++ b/src/glsl/link_functions.cpp
@@ -34,7 +34,7 @@ extern "C" {
#include "glsl_parser_extras.h"
#include "ir.h"
#include "program.h"
-#include "hash_table.h"
+#include "program/hash_table.h"
#include "linker.h"
static ir_function_signature *
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 9d53197fdd..a5faff2be7 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -78,7 +78,7 @@ extern "C" {
#include "glsl_symbol_table.h"
#include "ir.h"
#include "program.h"
-#include "hash_table.h"
+#include "program/hash_table.h"
#include "linker.h"
#include "ir_optimization.h"