diff options
Diffstat (limited to 'src')
62 files changed, 178 insertions, 56 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d4a7090dca5..2634c349433 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = gtest mapi +SUBDIRS = util gtest mapi if NEED_OPENGL_COMMON SUBDIRS += glsl mesa diff --git a/src/SConscript b/src/SConscript index 93a490dca86..2657bba47c7 100644 --- a/src/SConscript +++ b/src/SConscript @@ -4,6 +4,7 @@ Import('*') if env['platform'] == 'windows': SConscript('getopt/SConscript') +SConscript('util/SConscript') SConscript('glsl/SConscript') if env['hostonly']: diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index a8aaf221c9a..2c5951b8f6d 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -4,6 +4,7 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ + -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/mesa/program \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/glsl \ @@ -17,6 +18,7 @@ check_PROGRAMS = r300_compiler_tests TESTS = r300_compiler_tests r300_compiler_tests_LDADD = libr300.la libr300-helper.la \ + $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(GALLIUM_COMMON_LIB_DEPS) r300_compiler_tests_CPPFLAGS = \ @@ -32,4 +34,5 @@ libr300_la_SOURCES = $(C_SOURCES) # # Solve this by building them into a separate helper library that can be linked # in place of libmesagallium. +libr300_helper_la_CPPFLAGS = -I$(top_srcdir)/src libr300_helper_la_SOURCES = $(HELPER_SOURCES) diff --git a/src/gallium/drivers/r300/ralloc.c b/src/gallium/drivers/r300/ralloc.c index c5402db8e3f..7ad6def37c5 120000 --- a/src/gallium/drivers/r300/ralloc.c +++ b/src/gallium/drivers/r300/ralloc.c @@ -1 +1 @@ -../../../glsl/ralloc.c
\ No newline at end of file +../../../util/ralloc.c
\ No newline at end of file diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index fc0264c882a..22cf1077b19 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -27,6 +27,7 @@ if env['gles']: env.Prepend(LIBS = [ st_xlib, ws_xlib, + mesautil, glapi, mesa, glsl, diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 00261fd0d19..292c8f78775 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -21,6 +21,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/glsl/glcpp \ @@ -34,7 +35,6 @@ include Makefile.sources TESTS = glcpp/tests/glcpp-test \ tests/general-ir-test \ tests/optimization-test \ - tests/ralloc-test \ tests/sampler-types-test \ tests/uniform-initializer-test @@ -47,7 +47,6 @@ check_PROGRAMS = \ glcpp/glcpp \ glsl_test \ tests/general-ir-test \ - tests/ralloc-test \ tests/sampler-types-test \ tests/uniform-initializer-test @@ -87,14 +86,6 @@ tests_uniform_initializer_test_LDADD = \ $(top_builddir)/src/glsl/libglsl.la \ $(PTHREAD_LIBS) -tests_ralloc_test_SOURCES = \ - tests/ralloc_test.cpp \ - $(top_builddir)/src/glsl/ralloc.c -tests_ralloc_test_CFLAGS = $(PTHREAD_CFLAGS) -tests_ralloc_test_LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(PTHREAD_LIBS) - tests_sampler_types_test_SOURCES = \ $(top_srcdir)/src/mesa/program/prog_hash_table.c\ $(top_srcdir)/src/mesa/program/symbol_table.c \ @@ -107,6 +98,8 @@ tests_sampler_types_test_LDADD = \ $(top_builddir)/src/glsl/libglsl.la \ $(PTHREAD_LIBS) +libglcpp_la_LIBADD = \ + $(top_builddir)/src/util/libmesautil.la libglcpp_la_SOURCES = \ glcpp/glcpp-lex.c \ glcpp/glcpp-parse.c \ diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index b54eae72dea..2131ddafbd5 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -6,7 +6,6 @@ GLSL_BUILDDIR = $(top_builddir)/src/glsl # libglcpp LIBGLCPP_FILES = \ - $(GLSL_SRCDIR)/ralloc.c \ $(GLSL_SRCDIR)/glcpp/pp.c LIBGLCPP_GENERATED_FILES = \ diff --git a/src/glsl/SConscript b/src/glsl/SConscript index dc354775a55..d1d5993d60a 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -8,12 +8,15 @@ env = env.Clone() env.Prepend(CPPPATH = [ '#include', + '#src', '#src/mapi', '#src/mesa', '#src/glsl', '#src/glsl/glcpp', ]) +env.Prepend(LIBS = [mesautil]) + # Make glcpp-parse.h and glsl_parser.h reachable from the include path. env.Append(CPPPATH = [Dir('.').abspath, Dir('glcpp').abspath]) diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h index 2734f97ce25..70aa14b6ec0 100644 --- a/src/glsl/glcpp/glcpp.h +++ b/src/glsl/glcpp/glcpp.h @@ -29,7 +29,7 @@ #include "main/mtypes.h" -#include "../ralloc.h" +#include "util/ralloc.h" #include "program/hash_table.h" diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 890123ad1cf..e5c2dfee364 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -31,7 +31,7 @@ extern "C" { #include "main/shaderobj.h" } -#include "ralloc.h" +#include "util/ralloc.h" #include "ast.h" #include "glsl_parser_extras.h" #include "glsl_parser.h" diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 0b63d4850e1..50cd655dc76 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -81,7 +81,7 @@ enum glsl_interface_packing { #ifdef __cplusplus #include "GL/gl.h" -#include "ralloc.h" +#include "util/ralloc.h" struct glsl_type { GLenum gl_type; diff --git a/src/glsl/ir.h b/src/glsl/ir.h index ea19924ab4f..de28f87e63b 100644 --- a/src/glsl/ir.h +++ b/src/glsl/ir.h @@ -29,7 +29,7 @@ #include <stdio.h> #include <stdlib.h> -#include "ralloc.h" +#include "util/ralloc.h" #include "glsl_types.h" #include "list.h" #include "ir_visitor.h" diff --git a/src/glsl/list.h b/src/glsl/list.h index 3ee6cdaa9a9..b6c32bcccaf 100644 --- a/src/glsl/list.h +++ b/src/glsl/list.h @@ -69,7 +69,7 @@ #endif #include <assert.h> -#include "ralloc.h" +#include "util/ralloc.h" struct exec_node { struct exec_node *next; diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp index 809732c7e3d..abdd83a4408 100644 --- a/src/glsl/standalone_scaffolding.cpp +++ b/src/glsl/standalone_scaffolding.cpp @@ -31,7 +31,7 @@ #include <assert.h> #include <string.h> -#include "ralloc.h" +#include "util/ralloc.h" void _mesa_warning(struct gl_context *ctx, const char *fmt, ...) diff --git a/src/glsl/tests/builtin_variable_test.cpp b/src/glsl/tests/builtin_variable_test.cpp index 5076f8c54f4..11e384a0722 100644 --- a/src/glsl/tests/builtin_variable_test.cpp +++ b/src/glsl/tests/builtin_variable_test.cpp @@ -25,7 +25,6 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" #include "ir.h" #include "glsl_parser_extras.h" #include "glsl_symbol_table.h" diff --git a/src/glsl/tests/copy_constant_to_storage_tests.cpp b/src/glsl/tests/copy_constant_to_storage_tests.cpp index 6ab20841e23..65a9d502d47 100644 --- a/src/glsl/tests/copy_constant_to_storage_tests.cpp +++ b/src/glsl/tests/copy_constant_to_storage_tests.cpp @@ -24,7 +24,7 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "uniform_initializer_utils.h" namespace linker { diff --git a/src/glsl/tests/general_ir_test.cpp b/src/glsl/tests/general_ir_test.cpp index 862fa19abe2..882642d141b 100644 --- a/src/glsl/tests/general_ir_test.cpp +++ b/src/glsl/tests/general_ir_test.cpp @@ -24,7 +24,6 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" #include "ir.h" TEST(ir_variable_constructor, interface) diff --git a/src/glsl/tests/invalidate_locations_test.cpp b/src/glsl/tests/invalidate_locations_test.cpp index 997592fc940..ba94d7e3a21 100644 --- a/src/glsl/tests/invalidate_locations_test.cpp +++ b/src/glsl/tests/invalidate_locations_test.cpp @@ -24,7 +24,7 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "ir.h" #include "linker.h" diff --git a/src/glsl/tests/sampler_types_test.cpp b/src/glsl/tests/sampler_types_test.cpp index 86d329a8301..04dd65e6e8d 100644 --- a/src/glsl/tests/sampler_types_test.cpp +++ b/src/glsl/tests/sampler_types_test.cpp @@ -24,7 +24,6 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" #include "ir.h" /** diff --git a/src/glsl/tests/set_uniform_initializer_tests.cpp b/src/glsl/tests/set_uniform_initializer_tests.cpp index be202b3d57e..1d4169b037a 100644 --- a/src/glsl/tests/set_uniform_initializer_tests.cpp +++ b/src/glsl/tests/set_uniform_initializer_tests.cpp @@ -24,7 +24,7 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "uniform_initializer_utils.h" namespace linker { diff --git a/src/glsl/tests/uniform_initializer_utils.cpp b/src/glsl/tests/uniform_initializer_utils.cpp index 5e86c2432de..c61ef0d71cb 100644 --- a/src/glsl/tests/uniform_initializer_utils.cpp +++ b/src/glsl/tests/uniform_initializer_utils.cpp @@ -23,7 +23,7 @@ #include <gtest/gtest.h> #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "uniform_initializer_utils.h" #include <stdio.h> diff --git a/src/glsl/tests/varyings_test.cpp b/src/glsl/tests/varyings_test.cpp index 662fc0e4076..4573529f619 100644 --- a/src/glsl/tests/varyings_test.cpp +++ b/src/glsl/tests/varyings_test.cpp @@ -24,7 +24,7 @@ #include "main/compiler.h" #include "main/mtypes.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" #include "ir.h" #include "program/hash_table.h" diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index fdfb2d2ad06..8a04980e167 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -352,6 +352,7 @@ MESA_GALLIUM_FILES = \ INCLUDE_DIRS = \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/glsl \ -I$(top_builddir)/src/glsl \ -I$(top_srcdir)/src/glsl/glcpp \ diff --git a/src/mesa/SConscript b/src/mesa/SConscript index fbfacccd32f..a674a1bdc48 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -11,6 +11,7 @@ from sys import executable as python_cmd env = env.Clone() env.Append(CPPPATH = [ + '#/src', '#/src/mapi', '#/src/glsl', '#/src/mesa', 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, ]) diff --git a/src/mesa/main/hash_table.c b/src/mesa/main/hash_table.c index ad8f8985291..b51dada6691 100644 --- a/src/mesa/main/hash_table.c +++ b/src/mesa/main/hash_table.c @@ -45,7 +45,7 @@ #include "main/hash_table.h" #include "main/macros.h" -#include "ralloc.h" +#include "util/ralloc.h" static const uint32_t deleted_key_value; diff --git a/src/mesa/main/performance_monitor.c b/src/mesa/main/performance_monitor.c index c26eda4c63b..c02910e314e 100644 --- a/src/mesa/main/performance_monitor.c +++ b/src/mesa/main/performance_monitor.c @@ -43,7 +43,7 @@ #include "mtypes.h" #include "performance_monitor.h" #include "bitset.h" -#include "ralloc.h" +#include "util/ralloc.h" void _mesa_init_performance_monitors(struct gl_context *ctx) diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 90c1d005f74..017d4257eb8 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -44,7 +44,7 @@ #include "main/uniforms.h" #include "program/program.h" #include "program/prog_parameter.h" -#include "ralloc.h" +#include "util/ralloc.h" #include <stdbool.h> #include "../glsl/glsl_parser_extras.h" #include "../glsl/ir_uniform.h" diff --git a/src/mesa/main/set.c b/src/mesa/main/set.c index 989e5dece86..52c1dabd82b 100644 --- a/src/mesa/main/set.c +++ b/src/mesa/main/set.c @@ -36,7 +36,7 @@ #include "macros.h" #include "set.h" -#include "ralloc.h" +#include "util/ralloc.h" /* * From Knuth -- a good choice for hash/rehash values is p, p-2 where diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 2bbef35d363..85b975304ad 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -52,7 +52,7 @@ #include "program/program.h" #include "program/prog_print.h" #include "program/prog_parameter.h" -#include "ralloc.h" +#include "util/ralloc.h" #include <stdbool.h> #include "../glsl/glsl_parser_extras.h" #include "../glsl/ir.h" diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index b9feff4a404..693e9a259c2 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -40,7 +40,7 @@ #include "program/program.h" #include "program/prog_parameter.h" #include "program/hash_table.h" -#include "ralloc.h" +#include "util/ralloc.h" /**********************************************************************/ /*** Shader object functions ***/ diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am index 0d3a51f3962..3c7c1b51ad8 100644 --- a/src/mesa/main/tests/Makefile.am +++ b/src/mesa/main/tests/Makefile.am @@ -5,6 +5,7 @@ AM_CFLAGS = \ $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir)/src/gtest/include \ + -I$(top_srcdir)/src \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ -I$(top_builddir)/src/mesa \ diff --git a/src/mesa/program/register_allocate.c b/src/mesa/program/register_allocate.c index 6fac69033ed..549154e8a93 100644 --- a/src/mesa/program/register_allocate.c +++ b/src/mesa/program/register_allocate.c @@ -71,8 +71,8 @@ */ #include <stdbool.h> -#include <ralloc.h> +#include "util/ralloc.h" #include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" diff --git a/src/util/Makefile.am b/src/util/Makefile.am new file mode 100644 index 00000000000..1ed70c2c6ef --- /dev/null +++ b/src/util/Makefile.am @@ -0,0 +1,53 @@ +# Copyright © 2014 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +SUBDIRS = . tests + +include Makefile.sources + +noinst_LTLIBRARIES = libmesautil.la + +libmesautil_la_CPPFLAGS = \ + $(DEFINES) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mesa \ + $(VISIBILITY_CFLAGS) + +libmesautil_la_SOURCES = $(MESA_UTIL_FILES) + +### Tests: + +CFLAGS_FOR_TESTS = $(PTHREAD_CFLAGS) +CPPFLAGS_FOR_TESTS = \ + $(libmesautil_la_CPPFLAGS) \ + -I$(top_srcdir)/src/gtest/include +LDADD_FOR_TESTS = \ + $(top_builddir)/src/gtest/libgtest.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(PTHREAD_LIBS) + +TESTS = tests/ralloc_test +check_PROGRAMS = $(TESTS) + +tests_ralloc_test_SOURCES = tests/ralloc_test.cpp +tests_ralloc_test_CFLAGS = $(CFLAGS_FOR_TESTS) +tests_ralloc_test_CPPFLAGS = $(CPPFLAGS_FOR_TESTS) +tests_ralloc_test_LDADD = $(LDADD_FOR_TESTS) diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources new file mode 100644 index 00000000000..c4c79ca4431 --- /dev/null +++ b/src/util/Makefile.sources @@ -0,0 +1,2 @@ +MESA_UTIL_FILES := \ + ralloc.c diff --git a/src/util/SConscript b/src/util/SConscript new file mode 100644 index 00000000000..9653ef62ea1 --- /dev/null +++ b/src/util/SConscript @@ -0,0 +1,26 @@ +import common + +Import('*') + +from sys import executable as python_cmd + +env = env.Clone() + +env.Prepend(CPPPATH = [ + '#include', + '#src/mesa', + '#src/util', +]) + +# parse Makefile.sources +source_lists = env.ParseSourceList('Makefile.sources') + +mesautil_sources = source_lists['MESA_UTIL_FILES'] + +mesautil = env.ConvenienceLibrary( + target = 'mesautil', + source = mesautil_sources, +) + +env.Alias('mesautil', mesautil) +Export('mesautil') diff --git a/src/glsl/ralloc.c b/src/util/ralloc.c index 36bc61fd075..36bc61fd075 100644 --- a/src/glsl/ralloc.c +++ b/src/util/ralloc.c diff --git a/src/glsl/ralloc.h b/src/util/ralloc.h index 1fe53573f0d..1fe53573f0d 100644 --- a/src/glsl/ralloc.h +++ b/src/util/ralloc.h diff --git a/src/util/tests/Makefile.am b/src/util/tests/Makefile.am new file mode 100644 index 00000000000..a2b54982ff1 --- /dev/null +++ b/src/util/tests/Makefile.am @@ -0,0 +1,40 @@ +# Copyright © 2014 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +AM_CFLAGS = \ + $(PTHREAD_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/util \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/gtest/include \ + $(DEFINES) $(INCLUDE_DIRS) + +LDADD = \ + $(top_builddir)/src/gtest/libgtest.la \ + $(top_builddir)/src/util/libmesautil.la \ + $(PTHREAD_LIBS) + +TESTS = ralloc_test +check_PROGRAMS = $(TESTS) + +ralloc_test_SOURCES = ralloc_test.cpp diff --git a/src/glsl/tests/ralloc_test.cpp b/src/util/tests/ralloc_test.cpp index c0a870a8104..c0a870a8104 100644 --- a/src/glsl/tests/ralloc_test.cpp +++ b/src/util/tests/ralloc_test.cpp |