glsl2: Give the path within src/mesa/ for headers instead of relying on -I.

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index e2510a10c62aca6490472a2c3f54b96f05b55a89..9a957044e7a50f81c50e18c9039b353436be86b7 100644 (file)
--- 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 869de2efbcc7daf861c6306cb94269f12b8a8aad..0ccd957eda3c7207f79afcfbda14964c98d20d7f 100644 (file)
--- 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 8192b86dfc9a82ca503f1459975a737064e288c2..ce47b8167f42081447f4c5fc958057765acfb59f 100644 (file)
--- 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 db1e06932f4596f15bc0e1e2a37164ce562d8116..6dd910d5816cff89412de7206cadd4d0590c4b97 100644 (file)
--- 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 6be3e59a95d7aab8f36553aa291afdc253e56352..5ea3a79afcdb1170f0bfe0ceaec149c8f01debb2 100644 (file)
--- 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 77c264f288b96c46f811a79876e8760c32a52168..95993062435abb9f181c5b3e82719f4fae0ad010 100644 (file)
--- 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 1fa6e19ce9694bbb098fd131354176e9910fe0a5..85417a1dbc822fa8e9bfef27149bfb80c9b5a504 100644 (file)
--- 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 327be73afe6681ef09516e369bd178f2d022c541..fdf886f66275142e27eb595970fb4871ac056a00 100644 (file)
--- 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 9d53197fddae878e0654e7c3fb3a111a67174466..a5faff2be75b0fc15b15d75f328bd9322d99e835 100644 (file)
--- 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"