From 97c28bb63a4e1029eaf36d23b780f4d3396118a0 Mon Sep 17 00:00:00 2001 From: Younes Manton Date: Sun, 27 Sep 2009 21:54:20 -0400 Subject: [PATCH] g3dvl: Move XvMC under the Xorg state tracker. --- src/gallium/state_trackers/xorg/xvmc/Makefile | 16 +++++++ .../state_trackers/xorg/xvmc/SConscript | 27 +++++++++++ .../state_trackers/xorg}/xvmc/attributes.c | 0 .../state_trackers/xorg}/xvmc/block.c | 0 .../state_trackers/xorg}/xvmc/context.c | 0 .../state_trackers/xorg}/xvmc/subpicture.c | 0 .../state_trackers/xorg}/xvmc/surface.c | 0 .../xorg}/xvmc/tests/.gitignore | 0 .../state_trackers/xorg}/xvmc/tests/Makefile | 2 +- .../xorg}/xvmc/tests/test_blocks.c | 0 .../xorg}/xvmc/tests/test_context.c | 0 .../xorg}/xvmc/tests/test_rendering.c | 0 .../xorg}/xvmc/tests/test_surface.c | 0 .../state_trackers/xorg}/xvmc/tests/testlib.c | 0 .../state_trackers/xorg}/xvmc/tests/testlib.h | 0 .../xorg}/xvmc/tests/xvmc_bench.c | 0 .../state_trackers/xorg}/xvmc/xvmc_private.h | 0 src/gallium/winsys/g3dvl/xlib/Makefile | 4 +- src/xvmc/Makefile | 45 ------------------- src/xvmc/SConscript | 21 --------- 20 files changed, 46 insertions(+), 69 deletions(-) create mode 100644 src/gallium/state_trackers/xorg/xvmc/Makefile create mode 100644 src/gallium/state_trackers/xorg/xvmc/SConscript rename src/{ => gallium/state_trackers/xorg}/xvmc/attributes.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/block.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/context.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/subpicture.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/surface.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/.gitignore (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/Makefile (96%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/test_blocks.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/test_context.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/test_rendering.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/test_surface.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/testlib.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/testlib.h (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/tests/xvmc_bench.c (100%) rename src/{ => gallium/state_trackers/xorg}/xvmc/xvmc_private.h (100%) delete mode 100644 src/xvmc/Makefile delete mode 100644 src/xvmc/SConscript diff --git a/src/gallium/state_trackers/xorg/xvmc/Makefile b/src/gallium/state_trackers/xorg/xvmc/Makefile new file mode 100644 index 00000000000..126dc6d58f1 --- /dev/null +++ b/src/gallium/state_trackers/xorg/xvmc/Makefile @@ -0,0 +1,16 @@ +TOP = ../../../../.. +include $(TOP)/configs/current + +LIBNAME = xvmctracker + +LIBRARY_INCLUDES = \ + $(shell pkg-config --cflags-only-I xvmc) \ + -I$(TOP)/src/gallium/winsys/g3dvl + +C_SOURCES = block.c \ + surface.c \ + context.c \ + subpicture.c \ + attributes.c + +include ../../../Makefile.template diff --git a/src/gallium/state_trackers/xorg/xvmc/SConscript b/src/gallium/state_trackers/xorg/xvmc/SConscript new file mode 100644 index 00000000000..cb25d68bd80 --- /dev/null +++ b/src/gallium/state_trackers/xorg/xvmc/SConscript @@ -0,0 +1,27 @@ +####################################################################### +# SConscript for xvmc state_tracker + +Import('*') + +if 'xorg/xvmc' in env['statetrackers']: + + env = env.Clone() + + env.Append(CPPPATH = [ + '#/src/gallium/include', + '#/src/gallium/auxiliary', + '#/src/gallium/winsys/g3dvl', + ]) + + env.ParseConfig('pkg-config --cflags --libs xvmc') + + st_xvmc = env.ConvenienceLibrary( + target = 'st_xvmc', + source = [ 'block.c', + 'surface.c', + 'context.c', + 'subpicture.c', + 'attributes.c', + ] + ) + Export('st_xvmc') diff --git a/src/xvmc/attributes.c b/src/gallium/state_trackers/xorg/xvmc/attributes.c similarity index 100% rename from src/xvmc/attributes.c rename to src/gallium/state_trackers/xorg/xvmc/attributes.c diff --git a/src/xvmc/block.c b/src/gallium/state_trackers/xorg/xvmc/block.c similarity index 100% rename from src/xvmc/block.c rename to src/gallium/state_trackers/xorg/xvmc/block.c diff --git a/src/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c similarity index 100% rename from src/xvmc/context.c rename to src/gallium/state_trackers/xorg/xvmc/context.c diff --git a/src/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c similarity index 100% rename from src/xvmc/subpicture.c rename to src/gallium/state_trackers/xorg/xvmc/subpicture.c diff --git a/src/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c similarity index 100% rename from src/xvmc/surface.c rename to src/gallium/state_trackers/xorg/xvmc/surface.c diff --git a/src/xvmc/tests/.gitignore b/src/gallium/state_trackers/xorg/xvmc/tests/.gitignore similarity index 100% rename from src/xvmc/tests/.gitignore rename to src/gallium/state_trackers/xorg/xvmc/tests/.gitignore diff --git a/src/xvmc/tests/Makefile b/src/gallium/state_trackers/xorg/xvmc/tests/Makefile similarity index 96% rename from src/xvmc/tests/Makefile rename to src/gallium/state_trackers/xorg/xvmc/tests/Makefile index 11b2e1a812b..c875dd76058 100644 --- a/src/xvmc/tests/Makefile +++ b/src/gallium/state_trackers/xorg/xvmc/tests/Makefile @@ -1,4 +1,4 @@ -TOP = ../../.. +TOP = ../../../../../.. include $(TOP)/configs/current LIBS = -lXvMCW -lXvMC -lXv -lX11 diff --git a/src/xvmc/tests/test_blocks.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c similarity index 100% rename from src/xvmc/tests/test_blocks.c rename to src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c diff --git a/src/xvmc/tests/test_context.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_context.c similarity index 100% rename from src/xvmc/tests/test_context.c rename to src/gallium/state_trackers/xorg/xvmc/tests/test_context.c diff --git a/src/xvmc/tests/test_rendering.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c similarity index 100% rename from src/xvmc/tests/test_rendering.c rename to src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c diff --git a/src/xvmc/tests/test_surface.c b/src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c similarity index 100% rename from src/xvmc/tests/test_surface.c rename to src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c diff --git a/src/xvmc/tests/testlib.c b/src/gallium/state_trackers/xorg/xvmc/tests/testlib.c similarity index 100% rename from src/xvmc/tests/testlib.c rename to src/gallium/state_trackers/xorg/xvmc/tests/testlib.c diff --git a/src/xvmc/tests/testlib.h b/src/gallium/state_trackers/xorg/xvmc/tests/testlib.h similarity index 100% rename from src/xvmc/tests/testlib.h rename to src/gallium/state_trackers/xorg/xvmc/tests/testlib.h diff --git a/src/xvmc/tests/xvmc_bench.c b/src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c similarity index 100% rename from src/xvmc/tests/xvmc_bench.c rename to src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c diff --git a/src/xvmc/xvmc_private.h b/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h similarity index 100% rename from src/xvmc/xvmc_private.h rename to src/gallium/state_trackers/xorg/xvmc/xvmc_private.h diff --git a/src/gallium/winsys/g3dvl/xlib/Makefile b/src/gallium/winsys/g3dvl/xlib/Makefile index d4cbf0e2bba..cf765ef51a5 100644 --- a/src/gallium/winsys/g3dvl/xlib/Makefile +++ b/src/gallium/winsys/g3dvl/xlib/Makefile @@ -20,9 +20,9 @@ DEFINES += -DGALLIUM_SOFTPIPE \ SOURCES = xsp_winsys.c -# XXX: Hack, if we include libXvMCapi.a in LIBS none of the symbols are +# XXX: Hack, if we include libxvmctracker.a in LIBS none of the symbols are # pulled in by the linker because xsp_winsys.c doesn't refer to them -OBJECTS = $(SOURCES:.c=.o) $(TOP)/src/xvmc/*.o +OBJECTS = $(SOURCES:.c=.o) $(TOP)/src/gallium/state_trackers/xorg/xvmc/*.o LIBS = $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/auxiliary/vl/libvl.a \ diff --git a/src/xvmc/Makefile b/src/xvmc/Makefile deleted file mode 100644 index e7636e65c60..00000000000 --- a/src/xvmc/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -TOP = ../.. -include $(TOP)/configs/current - -#DEFINES += -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" - -SOURCES = block.c \ - surface.c \ - context.c \ - subpicture.c \ - attributes.c - -OBJECTS = $(SOURCES:.c=.o) - -INCLUDES = -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys/g3dvl - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@ - -##### TARGETS ##### - -.PHONY: default clean - -default: depend libXvMCapi.a - -libXvMCapi.a: $(OBJECTS) Makefile - $(MKLIB) -o XvMCapi $(MKLIB_OPTIONS) -static $(OBJECTS) - -depend: $(SOURCES) Makefile - $(RM) depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(SOURCES) - -clean: Makefile - $(RM) libXvMCapi.a - $(RM) *.o *~ - $(RM) depend depend.bak - --include depend diff --git a/src/xvmc/SConscript b/src/xvmc/SConscript deleted file mode 100644 index 53e04183e40..00000000000 --- a/src/xvmc/SConscript +++ /dev/null @@ -1,21 +0,0 @@ -Import('*') - -if env['platform'] not in ['linux']: - Return() - -env = env.Clone() - -env.AppendUnique(CPPPATH = [ - '#/src/gallium/winsys/g3dvl', -]) - -XvMCapi = env.StaticLibrary( - target = 'XvMCapi', - source = [ - 'block.c', - 'surface.c', - 'context.c', - 'subpicture.c', - 'attributes.c', - ], -) -- 2.30.2