Mesa (master): mesa: clean up #includes in ff_fragment_shader.cpp
Brian Paul
brianp at kemper.freedesktop.org
Thu Oct 1 14:09:22 UTC 2015
Module: Mesa
Branch: master
Commit: 1a22550725d37923d1304654d9156362bdd43ec5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a22550725d37923d1304654d9156362bdd43ec5
Author: Brian Paul <brianp at vmware.com>
Date: Wed Sep 30 08:14:04 2015 -0600
mesa: clean up #includes in ff_fragment_shader.cpp
Get rid of "../glsl/" paths. Sort alphabetically.
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/mesa/main/ff_fragment_shader.cpp | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index c682892..c0030bc 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -27,29 +27,27 @@
*
**************************************************************************/
-#include "glheader.h"
-#include "imports.h"
-#include "mtypes.h"
+#include "main/glheader.h"
#include "main/context.h"
+#include "main/imports.h"
#include "main/macros.h"
#include "main/samplerobj.h"
#include "main/texenvprogram.h"
#include "main/texobj.h"
#include "main/uniforms.h"
+#include "glsl/ir_builder.h"
+#include "glsl/ir_optimization.h"
+#include "glsl/glsl_parser_extras.h"
+#include "glsl/glsl_symbol_table.h"
+#include "glsl/glsl_types.h"
+#include "program/ir_to_mesa.h"
#include "program/program.h"
-#include "program/prog_parameter.h"
+#include "program/programopt.h"
#include "program/prog_cache.h"
#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "program/prog_statevars.h"
-#include "program/programopt.h"
-#include "../glsl/glsl_types.h"
-#include "../glsl/ir.h"
-#include "../glsl/ir_builder.h"
-#include "../glsl/glsl_symbol_table.h"
-#include "../glsl/glsl_parser_extras.h"
-#include "../glsl/ir_optimization.h"
-#include "../program/ir_to_mesa.h"
using namespace ir_builder;
More information about the mesa-commit
mailing list