From 2f0edc60f4bd2ae5999a6afa656e3bb3f181bf0f Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Fri, 26 Aug 2011 13:58:41 -0700 Subject: [PATCH] i965: Fix Android build by removing relative includes Replace each occurence of #include "../glsl/*.h" with #include "glsl/*.h" Reviewed-by: Ian Romanick Signed-off-by: Chad Versace --- src/mesa/drivers/dri/i965/brw_clip.c | 2 +- src/mesa/drivers/dri/i965/brw_context.c | 2 +- src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_eu.c | 2 +- src/mesa/drivers/dri/i965/brw_eu_emit.c | 2 +- src/mesa/drivers/dri/i965/brw_fs.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_fs.h | 4 ++-- .../drivers/dri/i965/brw_fs_channel_expressions.cpp | 6 +++--- src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 6 +++--- .../drivers/dri/i965/brw_fs_schedule_instructions.cpp | 6 +++--- src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp | 10 +++++----- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 6 +++--- src/mesa/drivers/dri/i965/brw_gs.c | 2 +- src/mesa/drivers/dri/i965/brw_program.c | 2 +- src/mesa/drivers/dri/i965/brw_sf.c | 2 +- src/mesa/drivers/dri/i965/brw_shader.cpp | 4 ++-- src/mesa/drivers/dri/i965/brw_state_batch.c | 2 +- src/mesa/drivers/dri/i965/brw_vec4.h | 2 +- src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vs.c | 2 +- src/mesa/drivers/dri/i965/brw_vtbl.c | 2 +- src/mesa/drivers/dri/i965/brw_wm.c | 2 +- 24 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index d82206bae52..b49c9f412ad 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.c +++ b/src/mesa/drivers/dri/i965/brw_clip.c @@ -42,7 +42,7 @@ #include "brw_state.h" #include "brw_clip.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" #define FRONT_UNFILLED_BIT 0x1 #define BACK_UNFILLED_BIT 0x2 diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index e00e24885ad..898ad8a83e8 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -40,7 +40,7 @@ #include "brw_state.h" #include "intel_span.h" #include "tnl/t_pipeline.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" /*************************************** * Mesa's Driver Functions diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp index 8574169e472..ff9485c2224 100644 --- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp +++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp @@ -30,8 +30,8 @@ * \author Eric Anholt */ -#include "../glsl/glsl_types.h" -#include "../glsl/ir.h" +#include "glsl/glsl_types.h" +#include "glsl/ir.h" class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor { public: diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index c1f2520eed8..0e04af99ff9 100644 --- a/src/mesa/drivers/dri/i965/brw_eu.c +++ b/src/mesa/drivers/dri/i965/brw_eu.c @@ -34,7 +34,7 @@ #include "brw_defines.h" #include "brw_eu.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" /* Returns the corresponding conditional mod for swapping src0 and * src1 in e.g. CMP. diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index c5013de7ec1..e8d09983405 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -34,7 +34,7 @@ #include "brw_defines.h" #include "brw_eu.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" /*********************************************************************** * Internal helper for constructing instructions diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 0b0445ea142..8b85f3bc1ed 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -46,8 +46,8 @@ extern "C" { } #include "brw_shader.h" #include "brw_fs.h" -#include "../glsl/glsl_types.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/glsl_types.h" +#include "glsl/ir_print_visitor.h" #define MAX_INSTRUCTION (1 << 30) diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index a06949e9deb..f3d8fbf3ec1 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -44,8 +44,8 @@ extern "C" { #include "brw_eu.h" #include "brw_wm.h" } -#include "../glsl/glsl_types.h" -#include "../glsl/ir.h" +#include "glsl/glsl_types.h" +#include "glsl/ir.h" enum register_file { ARF = BRW_ARCHITECTURE_REGISTER_FILE, diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp index 46677a6f2ef..2ba96e0064c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp @@ -45,9 +45,9 @@ extern "C" { #include "main/core.h" #include "brw_wm.h" } -#include "../glsl/ir.h" -#include "../glsl/ir_expression_flattening.h" -#include "../glsl/glsl_types.h" +#include "glsl/ir.h" +#include "glsl/ir_expression_flattening.h" +#include "glsl/glsl_types.h" class ir_channel_expressions_visitor : public ir_hierarchical_visitor { public: diff --git a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp index 28efbd3605f..ba0d2a26f1e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp @@ -34,7 +34,7 @@ extern "C" { } /* extern "C" */ #include "brw_fs.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/ir_print_visitor.h" void fs_visitor::generate_fb_write(fs_inst *inst) diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp index 7c5414ac26c..6e38cc250e8 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp @@ -26,9 +26,9 @@ */ #include "brw_fs.h" -#include "../glsl/glsl_types.h" -#include "../glsl/ir_optimization.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/glsl_types.h" +#include "glsl/ir_optimization.h" +#include "glsl/ir_print_visitor.h" static void assign_reg(int *reg_hw_locations, fs_reg *reg, int reg_width) diff --git a/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp b/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp index 0ea4e5c36f0..1f83ee278b2 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_schedule_instructions.cpp @@ -26,9 +26,9 @@ */ #include "brw_fs.h" -#include "../glsl/glsl_types.h" -#include "../glsl/ir_optimization.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/glsl_types.h" +#include "glsl/ir_optimization.h" +#include "glsl/ir_print_visitor.h" /** @file brw_fs_schedule_instructions.cpp * diff --git a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp index a9a60c2fd8a..42d2a509be9 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_vector_splitting.cpp @@ -41,11 +41,11 @@ extern "C" { #include "main/core.h" #include "intel_context.h" } -#include "../glsl/ir.h" -#include "../glsl/ir_visitor.h" -#include "../glsl/ir_print_visitor.h" -#include "../glsl/ir_rvalue_visitor.h" -#include "../glsl/glsl_types.h" +#include "glsl/ir.h" +#include "glsl/ir_visitor.h" +#include "glsl/ir_print_visitor.h" +#include "glsl/ir_rvalue_visitor.h" +#include "glsl/glsl_types.h" static bool debug = false; diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index cc6c56983fe..fc9d0e715db 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -46,9 +46,9 @@ extern "C" { } #include "brw_shader.h" #include "brw_fs.h" -#include "../glsl/glsl_types.h" -#include "../glsl/ir_optimization.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/glsl_types.h" +#include "glsl/ir_optimization.h" +#include "glsl/ir_print_visitor.h" void fs_visitor::visit(ir_variable *ir) diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index 3171e97d7af..f4656af13eb 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -42,7 +42,7 @@ #include "brw_state.h" #include "brw_gs.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" static void compile_gs_prog( struct brw_context *brw, struct brw_gs_prog_key *key ) diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 09b5be4c96e..97bd2221a3c 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -36,7 +36,7 @@ #include "program/program.h" #include "program/programopt.h" #include "tnl/tnl.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" #include "brw_context.h" #include "brw_wm.h" diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index fca30a74aaf..1c149dbfd1e 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/src/mesa/drivers/dri/i965/brw_sf.c @@ -43,7 +43,7 @@ #include "brw_sf.h" #include "brw_state.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" static void compile_sf_prog( struct brw_context *brw, struct brw_sf_prog_key *key ) diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 3ff6bbaed47..597c4cdf71d 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -27,8 +27,8 @@ extern "C" { #include "brw_vs.h" } #include "brw_fs.h" -#include "../glsl/ir_optimization.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/ir_optimization.h" +#include "glsl/ir_print_visitor.h" struct gl_shader * brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type) diff --git a/src/mesa/drivers/dri/i965/brw_state_batch.c b/src/mesa/drivers/dri/i965/brw_state_batch.c index 5a983c3d847..81d034ce822 100644 --- a/src/mesa/drivers/dri/i965/brw_state_batch.c +++ b/src/mesa/drivers/dri/i965/brw_state_batch.c @@ -32,7 +32,7 @@ #include "brw_state.h" #include "intel_batchbuffer.h" #include "main/imports.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" static void brw_track_state_batch(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 1db910e2b99..c03d204f076 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -35,7 +35,7 @@ extern "C" { #include "brw_eu.h" }; -#include "../glsl/ir.h" +#include "glsl/ir.h" namespace brw { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 65ac7d9dc09..47031bc9981 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -21,7 +21,7 @@ */ #include "brw_vec4.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/ir_print_visitor.h" extern "C" { #include "brw_eu.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp index 3f052ff64cf..72e0c0755f7 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp @@ -27,7 +27,7 @@ extern "C" { } /* extern "C" */ #include "brw_vec4.h" -#include "../glsl/ir_print_visitor.h" +#include "glsl/ir_print_visitor.h" using namespace brw; diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index 3373e707d98..f3a394bc62b 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.c +++ b/src/mesa/drivers/dri/i965/brw_vs.c @@ -38,7 +38,7 @@ #include "program/prog_print.h" #include "program/prog_parameter.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" static bool do_vs_prog(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index 40360b23fff..8b3677b422e 100644 --- a/src/mesa/drivers/dri/i965/brw_vtbl.c +++ b/src/mesa/drivers/dri/i965/brw_vtbl.c @@ -49,7 +49,7 @@ #include "brw_vs.h" #include "brw_wm.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" static void dri_bo_release(drm_intel_bo **bo) diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index e76832515fe..f746b31f66c 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -36,7 +36,7 @@ #include "main/samplerobj.h" #include "program/prog_parameter.h" -#include "../glsl/ralloc.h" +#include "glsl/ralloc.h" /** Return number of src args for given instruction */ GLuint brw_wm_nr_args( GLuint opcode ) -- 2.30.2