[Mesa-dev] [PATCH 7/8] i965: Fix Android build by removing relative includes
Ian Romanick
idr at freedesktop.org
Sat Aug 27 00:19:31 PDT 2011
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 08/26/2011 06:54 PM, Chad Versace wrote:
> Add $(TOP)/src/mesa to include paths and replace each occurence of
> #include "../glsl/*.h"
> with
> #include "glsl/*.h"
>
> Signed-off-by: Chad Versace <chad at chad-versace.us>
> ---
> src/mesa/drivers/dri/i965/Makefile | 1 +
> src/mesa/drivers/dri/i965/brw_clip.c | 2 +-
> src/mesa/drivers/dri/i965/brw_context.c | 2 +-
> .../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 ++--
> .../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 +++---
> .../dri/i965/brw_fs_schedule_instructions.cpp | 6 +++---
> .../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 +-
> .../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 +-
> 25 files changed, 41 insertions(+), 40 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile
> index 57af7a6..833efa3 100644
> --- a/src/mesa/drivers/dri/i965/Makefile
> +++ b/src/mesa/drivers/dri/i965/Makefile
> @@ -18,6 +18,7 @@ CXX_SOURCES := $(i965_CXX_SOURCES)
> ASM_SOURCES := $(i965_ASM_SOURCES)
> DRIVER_DEFINES := $(addprefix -I, $(i965_INCLUDES))
>
> +
Spurious whitespace.
> INCLUDES += $(INTEL_CFLAGS)
> DRI_LIB_DEPS += $(INTEL_LIBS)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
> index d82206b..b49c9f4 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 e00e248..898ad8a 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 8574169..ff9485c 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 <eric at anholt.net>
> */
>
> -#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 c1f2520..0e04af9 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 c5013de..e8d0998 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 0b0445e..8b85f3b 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 10f45f3..49454a5 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 46677a6..2ba96e0 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 28efbd3..ba0d2a2 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 7c5414a..6e38cc2 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 0ea4e5c..1f83ee2 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 a9a60c2..42d2a50 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 cdaf543..c9b54c4 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 3171e97..f4656af 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 09b5be4..97bd222 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 fca30a7..1c149db 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 3ff6bba..597c4cd 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 5a983c3..81d034c 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 1db910e..c03d204 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 65ac7d9..47031bc 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 3f052ff..72e0c07 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 3373e70..f3a394b 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 40360b2..8b3677b 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 e768325..f746b31 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 )
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iEYEARECAAYFAk5YmoMACgkQX1gOwKyEAw8PGQCfbrTz/zQ2XHeLLKWZIPX+0E5C
EV4Anj/KTONHvzyGoJAypB7FC0U1V7rJ
=5+Fb
-----END PGP SIGNATURE-----
More information about the mesa-dev
mailing list