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

[Brian Paul]

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

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

mesa: clean up #includes in sampler.cpp

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

---

 src/mesa/program/sampler.cpp |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index ea3024d..b1168fd 100644
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -23,13 +23,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "ir.h"
-#include "glsl_types.h"
-#include "ir_visitor.h"
-#include "../glsl/program.h"
-#include "ir_uniform.h"
-
 #include "main/mtypes.h"
+#include "glsl/glsl_types.h"
+#include "glsl/ir.h"
+#include "glsl/ir_uniform.h"
+#include "glsl/ir_visitor.h"
+#include "glsl/program.h"
 #include "program/hash_table.h"
 #include "program/prog_parameter.h"
 #include "program/program.h"