From 31747155ea3a24190277b125bd188ac8689af719 Mon Sep 17 00:00:00 2001
From: Aras Pranckevicius <aras@unity3d.com>
Date: Thu, 29 Jul 2010 12:40:49 +0300
Subject: [PATCH] glsl2: Give the path within src/mesa/ for headers instead of
 relying on -I.

---
 src/glsl/ast_type.cpp             | 2 +-
 src/glsl/glcpp/glcpp.h            | 2 +-
 src/glsl/glsl_types.cpp           | 2 +-
 src/glsl/hir_field_selection.cpp  | 2 +-
 src/glsl/ir_clone.cpp             | 2 +-
 src/glsl/ir_function_inlining.cpp | 2 +-
 src/glsl/ir_validate.cpp          | 2 +-
 src/glsl/link_functions.cpp       | 2 +-
 src/glsl/linker.cpp               | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index e2510a10c62..9a957044e7a 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 869de2efbcc..0ccd957eda3 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 8192b86dfc9..ce47b8167f4 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 db1e06932f4..6dd910d5816 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 6be3e59a95d..5ea3a79afcd 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 77c264f288b..95993062435 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 1fa6e19ce96..85417a1dbc8 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 327be73afe6..fdf886f6627 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 9d53197fdda..a5faff2be75 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"
 
-- 
2.30.2