diff options
Diffstat (limited to 'src/mesa/drivers')
23 files changed, 23 insertions, 22 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index b12898f265a..606b604bcfb 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -84,7 +84,7 @@ #include "drivers/common/meta.h" #include "main/enums.h" #include "main/glformats.h" -#include "../glsl/ralloc.h" +#include "util/ralloc.h" /** Return offset in bytes of the field within a vertex struct */ #define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD)) diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index bbf0c3c4530..31c88e16b6f 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -49,7 +49,7 @@ #include "main/viewport.h" #include "swrast/swrast.h" #include "drivers/common/meta.h" -#include "../glsl/ralloc.h" +#include "util/ralloc.h" /** Return offset in bytes of the field within a vertex struct */ #define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD)) diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index 0d46dba069b..299e54d50eb 100644 --- a/src/mesa/drivers/dri/i915/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c @@ -35,7 +35,7 @@ #include "tnl/t_context.h" #include "tnl/t_pipeline.h" #include "intel_tris.h" -#include "../glsl/ralloc.h" +#include "util/ralloc.h" /*************************************** * Mesa's Driver Functions diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 44b0d8bb5ce..7f438961a99 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -40,7 +40,7 @@ #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" -#include "../glsl/ralloc.h" +#include "util/ralloc.h" #include "i915_reg.h" #include "i915_program.h" diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 09fe37190e3..3104776c4ea 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -56,7 +56,7 @@ #include "intel_mipmap_tree.h" #include "utils.h" -#include "../glsl/ralloc.h" +#include "util/ralloc.h" int INTEL_DEBUG = (0); diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp index c1676a9db44..9459d5cf695 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "brw_blorp_blit_eu.h" #include "brw_blorp.h" diff --git a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp index df34c724073..ffbcd1a81b9 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp @@ -28,7 +28,7 @@ extern "C" { #include "main/renderbuffer.h" } -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "intel_fbo.h" diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c index cf51d8e17fa..d6ccfa42fa2 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 "util/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 89f5df5b5c6..52f2557504a 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -65,7 +65,7 @@ #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" #include "tnl/t_pipeline.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" /*************************************** * Mesa's Driver Functions diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c index a400b4486aa..b4d5d882883 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 "util/ralloc.h" /** * Converts a BRW_REGISTER_TYPE_* enum to a short string (F, UD, and so on). diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index 12424bde833..446d1495ac3 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 "util/ralloc.h" /*********************************************************************** * Internal helper for constructing instructions diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c index 8570f7a2365..fbd728f67c3 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -43,7 +43,7 @@ #include "brw_state.h" #include "brw_gs.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" static void compile_ff_gs_prog(struct brw_context *brw, struct brw_ff_gs_prog_key *key) diff --git a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c index bdd642bf9c5..0b4742693db 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c +++ b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c @@ -57,7 +57,7 @@ #include "main/blend.h" #include "main/varray.h" #include "main/shaderapi.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "drivers/common/meta.h" #include "brw_meta_util.h" diff --git a/src/mesa/drivers/dri/i965/brw_performance_monitor.c b/src/mesa/drivers/dri/i965/brw_performance_monitor.c index 3312b10cd29..edfa3d2ec2a 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_monitor.c +++ b/src/mesa/drivers/dri/i965/brw_performance_monitor.c @@ -50,7 +50,7 @@ #include "main/mtypes.h" #include "main/performance_monitor.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "brw_context.h" #include "brw_defines.h" diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index cff11887cba..d782b4fdafb 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -38,7 +38,7 @@ #include "program/program.h" #include "program/programopt.h" #include "tnl/tnl.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "glsl/ir.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c index c9f3a9f4218..dc6135e00e3 100644 --- a/src/mesa/drivers/dri/i965/brw_sf.c +++ b/src/mesa/drivers/dri/i965/brw_sf.c @@ -45,7 +45,7 @@ #include "brw_sf.h" #include "brw_state.h" -#include "glsl/ralloc.h" +#include "util/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_state_batch.c b/src/mesa/drivers/dri/i965/brw_state_batch.c index d86a5889894..45dca69823f 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 "util/ralloc.h" static void brw_track_state_batch(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c index e0f32b3333f..19b1d3b1a12 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 "util/ralloc.h" static inline void assign_vue_slot(struct brw_vue_map *vue_map, int varying) diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 15fcc1fd35b..6e068d381b7 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -40,7 +40,7 @@ #include "program/program.h" #include "intel_mipmap_tree.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" /** * Return a bitfield where bit n is set if barycentric interpolation mode n diff --git a/src/mesa/drivers/dri/i965/gen8_generator.cpp b/src/mesa/drivers/dri/i965/gen8_generator.cpp index 1f03c8198a3..e837dc3e403 100644 --- a/src/mesa/drivers/dri/i965/gen8_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_generator.cpp @@ -32,7 +32,7 @@ extern "C" { #include "brw_context.h" } /* extern "C" */ -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "brw_eu.h" #include "brw_reg.h" #include "gen8_generator.h" diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 5b0cbf30a05..5ebf1d505ae 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -37,7 +37,7 @@ #include "main/fbobject.h" #include "main/version.h" #include "swrast/s_renderbuffer.h" -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "utils.h" #include "xmlpool.h" diff --git a/src/mesa/drivers/dri/i965/test_eu_compact.c b/src/mesa/drivers/dri/i965/test_eu_compact.c index 92b6dd5497c..d95d2c04771 100644 --- a/src/mesa/drivers/dri/i965/test_eu_compact.c +++ b/src/mesa/drivers/dri/i965/test_eu_compact.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <stdio.h> #include <stdbool.h> -#include "glsl/ralloc.h" +#include "util/ralloc.h" #include "brw_context.h" #include "brw_eu.h" diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index b1b854d0225..320cece886c 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -16,6 +16,7 @@ env.Prepend(LIBPATH = env['X11_LIBPATH']) env.Prepend(LIBS = [ glapi, + mesautil, glsl, mesa, ]) |