Mesa (master): mesa: clean up #includes in ir_to_mesa.cpp

[Brian Paul]

Module: Mesa
Branch: master
Commit: 32a4999ee7a6de0780eb467b9d5e74a2968bdae0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32a4999ee7a6de0780eb467b9d5e74a2968bdae0

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Sep 30 08:22:05 2015 -0600

mesa: clean up #includes in ir_to_mesa.cpp

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/mesa/program/ir_to_mesa.cpp |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 4201a80..35ea791 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -31,22 +31,20 @@
 
 #include <stdio.h>
 #include "main/compiler.h"
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_expression_flattening.h"
-#include "ir_uniform.h"
-#include "glsl_types.h"
-#include "glsl_parser_extras.h"
-#include "../glsl/program.h"
-#include "ir_optimization.h"
-#include "ast.h"
-#include "linker.h"
-
 #include "main/mtypes.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
-
+#include "glsl/ast.h"
+#include "glsl/ir.h"
+#include "glsl/ir_expression_flattening.h"
+#include "glsl/ir_visitor.h"
+#include "glsl/ir_optimization.h"
+#include "glsl/ir_uniform.h"
+#include "glsl/glsl_parser_extras.h"
+#include "glsl/glsl_types.h"
+#include "glsl/linker.h"
+#include "glsl/program.h"
 #include "program/hash_table.h"
 #include "program/prog_instruction.h"
 #include "program/prog_optimize.h"