From: Brian Paul <brianp@vmware.com>
Date: Wed, 30 Sep 2015 14:21:25 +0000 (-0600)
Subject: mesa: clean up #includes in uniform_query.cpp
X-Git-Tag: android-x86-6.0-r1~6921
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e13b5150449fbb2cb172157e59d4f848085c9386;p=android-x86%2Fexternal-mesa.git

mesa: clean up #includes in uniform_query.cpp

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

diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 0bee59455a3..33c959dc1a5 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