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

[Brian Paul]

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

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

mesa: clean up #includes in uniform_query.cpp

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

---

 src/mesa/main/uniform_query.cpp |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 0bee594..33c959d 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -28,15 +28,14 @@
 
 #include "main/core.h"
 #include "main/context.h"
-#include "ir.h"
-#include "ir_uniform.h"
-#include "program/hash_table.h"
-#include "../glsl/program.h"
-#include "../glsl/ir_uniform.h"
-#include "../glsl/glsl_parser_extras.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
-#include "uniforms.h"
+#include "main/uniforms.h"
+#include "glsl/ir.h"
+#include "glsl/ir_uniform.h"
+#include "glsl/glsl_parser_extras.h"
+#include "glsl/program.h"
+#include "program/hash_table.h"
 
 
 extern "C" void GLAPIENTRY