OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

program/hash_table.c: rename to program/prog_hash_table.c

Browse Source 
Removes a collision of the object file name for main/hash_table
and program/hash_table.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Jordan Justen
2012-11-30 16:32:11 -08:00
parent 970ec8dbc3
commit 59284bc44a
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/Makefile.am
View File

@@ -49,14 +49,14 @@ libglsl_la_LIBADD = glcpp/libglcpp.la
libglsl_la_LDFLAGS = libglsl_la_LDFLAGS =
glsl_compiler_SOURCES = \ 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 \ $(top_srcdir)/src/mesa/program/symbol_table.c \
$(GLSL_COMPILER_CXX_FILES) $(GLSL_COMPILER_CXX_FILES)
glsl_compiler_LDADD = libglsl.la glsl_compiler_LDADD = libglsl.la
glsl_test_SOURCES = \ 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 \ $(top_srcdir)/src/mesa/program/symbol_table.c \
$(GLSL_SRCDIR)/standalone_scaffolding.cpp \ $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
test.cpp \ test.cpp \

4
src/glsl/SConscript
View File

@@ -58,13 +58,13 @@ if env['crosscompile'] and not env['embedded']:
else: else:
# Copy these files to avoid generation object files into src/mesa/program # Copy these files to avoid generation object files into src/mesa/program
env.Prepend(CPPPATH = ['#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')) env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES']) compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
mesa_objs = env.StaticObject([ mesa_objs = env.StaticObject([
'hash_table.c', 'prog_hash_table.c',
'symbol_table.c', 'symbol_table.c',
]) ])

2
src/glsl/builtin_compiler/Makefile.am
View File

@@ -55,7 +55,7 @@ builtin_compiler_SOURCES = \
$(GLSL_BUILDDIR)/glsl_parser.cc \ $(GLSL_BUILDDIR)/glsl_parser.cc \
$(LIBGLSL_FILES) \ $(LIBGLSL_FILES) \
$(LIBGLSL_CXX_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 \ $(top_srcdir)/src/mesa/program/symbol_table.c \
$(GLSL_COMPILER_CXX_FILES) \ $(GLSL_COMPILER_CXX_FILES) \
builtin_stubs.cpp builtin_stubs.cpp

2
src/glsl/glcpp/Makefile.am
View File

@@ -46,7 +46,7 @@ libglcpp_la_SOURCES = \
glcpp_SOURCES = \ glcpp_SOURCES = \
../ralloc.c \ ../ralloc.c \
$(top_srcdir)/src/mesa/program/hash_table.c \ $(top_srcdir)/src/mesa/program/prog_hash_table.c \
glcpp.c glcpp.c
glcpp_LDADD = libglcpp.la glcpp_LDADD = libglcpp.la

4
src/mesa/Android.libmesa_glsl_utils.mk
View File

@@ -36,7 +36,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_glsl_utils LOCAL_MODULE := libmesa_glsl_utils
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
program/hash_table.c \ program/prog_hash_table.c \
program/symbol_table.c program/symbol_table.c
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
@@ -52,7 +52,7 @@ LOCAL_MODULE := libmesa_glsl_utils
LOCAL_IS_HOST_MODULE := true LOCAL_IS_HOST_MODULE := true
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
program/hash_table.c \ program/prog_hash_table.c \
program/symbol_table.c program/symbol_table.c
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)

2
src/mesa/SConscript
View File

@@ -294,7 +294,7 @@ env.Append(CPPPATH = [Dir('.').abspath])
program_sources = [ program_sources = [
'program/arbprogparse.c', 'program/arbprogparse.c',
'program/hash_table.c', 'program/prog_hash_table.c',
'program/ir_to_mesa.cpp', 'program/ir_to_mesa.cpp',
'program/program.c', 'program/program.c',
'program/program_parse_extra.c', 'program/program_parse_extra.c',

0
src/mesa/program/hash_table.c → src/mesa/program/prog_hash_table.c
View File

2
src/mesa/sources.mak
View File

@@ -248,7 +248,7 @@ STATETRACKER_FILES = \
PROGRAM_FILES = \ PROGRAM_FILES = \
$(SRCDIR)program/arbprogparse.c \ $(SRCDIR)program/arbprogparse.c \
$(SRCDIR)program/hash_table.c \ $(SRCDIR)program/prog_hash_table.c \
$(SRCDIR)program/ir_to_mesa.cpp \ $(SRCDIR)program/ir_to_mesa.cpp \
$(SRCDIR)program/program.c \ $(SRCDIR)program/program.c \
$(SRCDIR)program/program_parse_extra.c \ $(SRCDIR)program/program_parse_extra.c \