diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/Makefile.am | 4 | ||||
| -rw-r--r-- | src/glsl/SConscript | 4 | ||||
| -rw-r--r-- | src/glsl/builtin_compiler/Makefile.am | 2 | ||||
| -rw-r--r-- | src/glsl/glcpp/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_glsl_utils.mk | 4 | ||||
| -rw-r--r-- | src/mesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/program/prog_hash_table.c (renamed from src/mesa/program/hash_table.c) | 0 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index ea7617685dc..2ba439c77cc 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -49,14 +49,14 @@ libglsl_la_LIBADD = glcpp/libglcpp.la libglsl_la_LDFLAGS = glsl_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/program/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ $(top_srcdir)/src/mesa/program/symbol_table.c \ $(GLSL_COMPILER_CXX_FILES) glsl_compiler_LDADD = libglsl.la glsl_test_SOURCES = \ - $(top_srcdir)/src/mesa/program/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ $(top_srcdir)/src/mesa/program/symbol_table.c \ $(GLSL_SRCDIR)/standalone_scaffolding.cpp \ test.cpp \ diff --git a/src/glsl/SConscript b/src/glsl/SConscript index 0cf25c07b92..38de60ded33 100644 --- a/src/glsl/SConscript +++ b/src/glsl/SConscript @@ -58,13 +58,13 @@ if env['crosscompile'] and not env['embedded']: else: # Copy these files to avoid generation object files into src/mesa/program env.Prepend(CPPPATH = ['#src/mesa/program']) - env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE')) + env.Command('prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE')) env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE')) compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) mesa_objs = env.StaticObject([ - 'hash_table.c', + 'prog_hash_table.c', 'symbol_table.c', ]) diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am index d6f85a7f44e..5fad35d50e7 100644 --- a/src/glsl/builtin_compiler/Makefile.am +++ b/src/glsl/builtin_compiler/Makefile.am @@ -55,7 +55,7 @@ builtin_compiler_SOURCES = \ $(GLSL_BUILDDIR)/glsl_parser.cc \ $(LIBGLSL_FILES) \ $(LIBGLSL_CXX_FILES) \ - $(top_srcdir)/src/mesa/program/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ $(top_srcdir)/src/mesa/program/symbol_table.c \ $(GLSL_COMPILER_CXX_FILES) \ builtin_stubs.cpp diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am index 04d8cda0194..d8d39d295fa 100644 --- a/src/glsl/glcpp/Makefile.am +++ b/src/glsl/glcpp/Makefile.am @@ -46,7 +46,7 @@ libglcpp_la_SOURCES = \ glcpp_SOURCES = \ ../ralloc.c \ - $(top_srcdir)/src/mesa/program/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c \ glcpp.c glcpp_LDADD = libglcpp.la diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk index 4802757955f..5ae946fd8dc 100644 --- a/src/mesa/Android.libmesa_glsl_utils.mk +++ b/src/mesa/Android.libmesa_glsl_utils.mk @@ -36,7 +36,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_glsl_utils LOCAL_SRC_FILES := \ - program/hash_table.c \ + program/prog_hash_table.c \ program/symbol_table.c include $(MESA_COMMON_MK) @@ -52,7 +52,7 @@ LOCAL_MODULE := libmesa_glsl_utils LOCAL_IS_HOST_MODULE := true LOCAL_SRC_FILES := \ - program/hash_table.c \ + program/prog_hash_table.c \ program/symbol_table.c include $(MESA_COMMON_MK) diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 0b4dd7e381e..a2492f7716f 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -294,7 +294,7 @@ env.Append(CPPPATH = [Dir('.').abspath]) program_sources = [ 'program/arbprogparse.c', - 'program/hash_table.c', + 'program/prog_hash_table.c', 'program/ir_to_mesa.cpp', 'program/program.c', 'program/program_parse_extra.c', diff --git a/src/mesa/program/hash_table.c b/src/mesa/program/prog_hash_table.c index f45ed46afad..f45ed46afad 100644 --- a/src/mesa/program/hash_table.c +++ b/src/mesa/program/prog_hash_table.c diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 86aa31dac17..8cde2c4cf6d 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -248,7 +248,7 @@ STATETRACKER_FILES = \ PROGRAM_FILES = \ $(SRCDIR)program/arbprogparse.c \ - $(SRCDIR)program/hash_table.c \ + $(SRCDIR)program/prog_hash_table.c \ $(SRCDIR)program/ir_to_mesa.cpp \ $(SRCDIR)program/program.c \ $(SRCDIR)program/program_parse_extra.c \ |