There seems to be some 'extra includes', not sure if you want to start going through them at this same time? As example sampler.cpp does not need to include glsl/ir_visitor.h since it comes with glsl/ir.h.

Anyway nice cleanup, series is
Reviewed-by: Tapani Pälli <[email protected]>

On 10/01/2015 12:35 AM, Brian Paul wrote:
Get rid of "../glsl/" paths.  Sort alphabetically.
---
  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;


_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to