From dcf8ee7d6ac89bb2a9d608618a51604a3c78fe96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Wed, 15 Feb 2012 17:30:58 +0100 Subject: [PATCH] st/xvmc: move xvmc state tracker out of xorg subdir MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The xvmc state tracker is completely seperate and doesn't shares code or anything else with the xorg state tracker. Signed-off-by: Christian König --- configure.ac | 2 +- .../state_trackers/{xorg => }/xvmc/Makefile | 4 ++-- .../state_trackers/{xorg => }/xvmc/attributes.c | 0 src/gallium/state_trackers/{xorg => }/xvmc/block.c | 0 .../state_trackers/{xorg => }/xvmc/context.c | 0 .../state_trackers/{xorg => }/xvmc/subpicture.c | 2 +- .../state_trackers/{xorg => }/xvmc/surface.c | 4 ++-- .../{xorg => }/xvmc/tests/.gitignore | 0 .../state_trackers/{xorg => }/xvmc/tests/Makefile | 2 +- .../{xorg => }/xvmc/tests/test_blocks.c | 22 +++++++++++----------- .../{xorg => }/xvmc/tests/test_context.c | 22 +++++++++++----------- .../{xorg => }/xvmc/tests/test_rendering.c | 20 ++++++++++---------- .../{xorg => }/xvmc/tests/test_subpicture.c | 20 ++++++++++---------- .../{xorg => }/xvmc/tests/test_surface.c | 22 +++++++++++----------- .../state_trackers/{xorg => }/xvmc/tests/testlib.c | 10 +++++----- .../state_trackers/{xorg => }/xvmc/tests/testlib.h | 10 +++++----- .../{xorg => }/xvmc/tests/xvmc_bench.c | 22 +++++++++++----------- .../state_trackers/{xorg => }/xvmc/xvmc_private.h | 0 src/gallium/targets/Makefile.xvmc | 4 ++-- 19 files changed, 83 insertions(+), 83 deletions(-) rename src/gallium/state_trackers/{xorg => }/xvmc/Makefile (83%) 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 (99%) rename src/gallium/state_trackers/{xorg => }/xvmc/surface.c (99%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/.gitignore (100%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/Makefile (97%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/test_blocks.c (96%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/test_context.c (97%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/test_rendering.c (98%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/test_subpicture.c (98%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/test_surface.c (96%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/testlib.c (99%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/testlib.h (99%) rename src/gallium/state_trackers/{xorg => }/xvmc/tests/xvmc_bench.c (98%) rename src/gallium/state_trackers/{xorg => }/xvmc/xvmc_private.h (100%) diff --git a/configure.ac b/configure.ac index 846b623..627f9c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1582,7 +1582,7 @@ fi if test "x$enable_xvmc" = xyes; then PKG_CHECK_MODULES([XVMC], [xvmc >= 1.0.6]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg/xvmc" + GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc" HAVE_ST_XVMC="yes" fi diff --git a/src/gallium/state_trackers/xorg/xvmc/Makefile b/src/gallium/state_trackers/xvmc/Makefile similarity index 83% rename from src/gallium/state_trackers/xorg/xvmc/Makefile rename to src/gallium/state_trackers/xvmc/Makefile index c468099..179446f 100644 --- a/src/gallium/state_trackers/xorg/xvmc/Makefile +++ b/src/gallium/state_trackers/xvmc/Makefile @@ -1,4 +1,4 @@ -TOP = ../../../../.. +TOP = ../../../.. include $(TOP)/configs/current LIBNAME = xvmctracker @@ -13,4 +13,4 @@ C_SOURCES = block.c \ subpicture.c \ attributes.c -include ../../../Makefile.template +include ../../Makefile.template diff --git a/src/gallium/state_trackers/xorg/xvmc/attributes.c b/src/gallium/state_trackers/xvmc/attributes.c similarity index 100% rename from src/gallium/state_trackers/xorg/xvmc/attributes.c rename to src/gallium/state_trackers/xvmc/attributes.c diff --git a/src/gallium/state_trackers/xorg/xvmc/block.c b/src/gallium/state_trackers/xvmc/block.c similarity index 100% rename from src/gallium/state_trackers/xorg/xvmc/block.c rename to src/gallium/state_trackers/xvmc/block.c diff --git a/src/gallium/state_trackers/xorg/xvmc/context.c b/src/gallium/state_trackers/xvmc/context.c similarity index 100% rename from src/gallium/state_trackers/xorg/xvmc/context.c rename to src/gallium/state_trackers/xvmc/context.c diff --git a/src/gallium/state_trackers/xorg/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c similarity index 99% rename from src/gallium/state_trackers/xorg/xvmc/subpicture.c rename to src/gallium/state_trackers/xvmc/subpicture.c index d6be28e..6b1b091 100644 --- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -323,7 +323,7 @@ Status XvMCClearSubpicture(Display *dpy, XvMCSubpicture *subpicture, short x, sh context_priv = subpicture_priv->context->privData; pipe = context_priv->pipe; dst = subpicture_priv->sampler; - + /* TODO: Assert clear rect is within bounds? Or clip? */ transfer = pipe->get_transfer(pipe, dst->texture, 0, PIPE_TRANSFER_WRITE, &dst_box); if (!transfer) diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xvmc/surface.c similarity index 99% rename from src/gallium/state_trackers/xorg/xvmc/surface.c rename to src/gallium/state_trackers/xvmc/surface.c index 293e7ad..834841c 100644 --- a/src/gallium/state_trackers/xorg/xvmc/surface.c +++ b/src/gallium/state_trackers/xvmc/surface.c @@ -437,7 +437,7 @@ Status XvMCPutSurface(Display *dpy, XvMCSurface *surface, Drawable drawable, pipe->screen->fence_reference(pipe->screen, &surface_priv->fence, NULL); vl_compositor_render(compositor, context_priv->drawable_surface, &dst_rect, NULL, &context_priv->dirty_area); - + pipe->flush(pipe, &surface_priv->fence); XVMC_MSG(XVMC_TRACE, "[XvMC] Submitted surface %p for display. Pushing to front buffer.\n", surface); @@ -508,7 +508,7 @@ Status XvMCDestroySurface(Display *dpy, XvMCSurface *surface) surface_priv = surface->privData; context_priv = surface_priv->context->privData; - + if (surface_priv->picture_structure) { struct pipe_mpeg12_picture_desc desc; GetPictureDescription(surface_priv, &desc); diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/.gitignore b/src/gallium/state_trackers/xvmc/tests/.gitignore similarity index 100% rename from src/gallium/state_trackers/xorg/xvmc/tests/.gitignore rename to src/gallium/state_trackers/xvmc/tests/.gitignore diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/Makefile b/src/gallium/state_trackers/xvmc/tests/Makefile similarity index 97% rename from src/gallium/state_trackers/xorg/xvmc/tests/Makefile rename to src/gallium/state_trackers/xvmc/tests/Makefile index 88b0376..fa19045 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/Makefile +++ b/src/gallium/state_trackers/xvmc/tests/Makefile @@ -1,4 +1,4 @@ -TOP = ../../../../../.. +TOP = ../../../../.. include $(TOP)/configs/current LIBS = -lXvMCW -lXvMC -lXv -lX11 diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c b/src/gallium/state_trackers/xvmc/tests/test_blocks.c similarity index 96% rename from src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c rename to src/gallium/state_trackers/xvmc/tests/test_blocks.c index 994e3ca..f8fc2f5 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/test_blocks.c +++ b/src/gallium/state_trackers/xvmc/tests/test_blocks.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #include @@ -53,12 +53,12 @@ int main(int argc, char **argv) width, height, XVMC_CHROMA_FORMAT_420, - mc_types, - 2, - &port_num, - &surface_type_id, - &is_overlay, - &intra_unsigned + mc_types, + 2, + &port_num, + &surface_type_id, + &is_overlay, + &intra_unsigned )) { XCloseDisplay(display); diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/test_context.c b/src/gallium/state_trackers/xvmc/tests/test_context.c similarity index 97% rename from src/gallium/state_trackers/xorg/xvmc/tests/test_context.c rename to src/gallium/state_trackers/xvmc/tests/test_context.c index 3da957c..eed9a08 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/test_context.c +++ b/src/gallium/state_trackers/xvmc/tests/test_context.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #include @@ -49,12 +49,12 @@ int main(int argc, char **argv) width, height, XVMC_CHROMA_FORMAT_420, - mc_types, - 2, - &port_num, - &surface_type_id, - &is_overlay, - &intra_unsigned + mc_types, + 2, + &port_num, + &surface_type_id, + &is_overlay, + &intra_unsigned )) { XCloseDisplay(display); diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c b/src/gallium/state_trackers/xvmc/tests/test_rendering.c similarity index 98% rename from src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c rename to src/gallium/state_trackers/xvmc/tests/test_rendering.c index 94ac7d4..a7a6bda 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c +++ b/src/gallium/state_trackers/xvmc/tests/test_rendering.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #include @@ -159,12 +159,12 @@ int main(int argc, char **argv) INPUT_WIDTH, INPUT_HEIGHT, XVMC_CHROMA_FORMAT_420, - mc_types, + mc_types, sizeof(mc_types)/sizeof(*mc_types), - &port_num, - &surface_type_id, - &is_overlay, - &intra_unsigned + &port_num, + &surface_type_id, + &is_overlay, + &intra_unsigned )) { XCloseDisplay(display); diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/test_subpicture.c b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c similarity index 98% rename from src/gallium/state_trackers/xorg/xvmc/tests/test_subpicture.c rename to src/gallium/state_trackers/xvmc/tests/test_subpicture.c index 20d0907..9683a1a 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/test_subpicture.c +++ b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c @@ -77,12 +77,12 @@ int main(int argc, char **argv) width, height, XVMC_CHROMA_FORMAT_420, - mc_types, - 2, - &port_num, - &surface_type_id, - &is_overlay, - &intra_unsigned + mc_types, + 2, + &port_num, + &surface_type_id, + &is_overlay, + &intra_unsigned )) { XCloseDisplay(display); @@ -96,10 +96,10 @@ int main(int argc, char **argv) } assert(XvMCCreateContext(display, port_num, surface_type_id, width, height, XVMC_DIRECT, &context) == Success); - + subpics = XvMCListSubpictureTypes(display, port_num, surface_type_id, &num_subpics); assert((subpics && num_subpics) > 0 || (!subpics && num_subpics == 0)); - + for (i = 0; i < num_subpics; ++i) { printf("Subpicture %d:\n", i); @@ -110,7 +110,7 @@ int main(int argc, char **argv) printf("\tbpp: %u\n", subpics[i].bits_per_pixel); printf("\tformat: %s\n", subpics[i].format == XvPacked ? "XvPacked" : (subpics[i].format == XvPlanar ? "XvPlanar" : "Unknown")); printf("\tnum_planes: %u\n", subpics[i].num_planes); - + if (subpics[i].type == XvRGB) { printf("\tdepth: %u\n", subpics[i].depth); @@ -133,7 +133,7 @@ int main(int argc, char **argv) PrintComponentOrder(subpics[i].component_order); printf("\tscanline_order: %s\n", subpics[i].scanline_order == XvTopToBottom ? "XvTopToBottom" : (subpics[i].scanline_order == XvBottomToTop ? "XvBottomToTop" : "Unknown")); } - + if (num_subpics == 0) { printf("Subpictures not supported, nothing to test.\n"); diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c b/src/gallium/state_trackers/xvmc/tests/test_surface.c similarity index 96% rename from src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c rename to src/gallium/state_trackers/xvmc/tests/test_surface.c index b65eb26..1705a26 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/test_surface.c +++ b/src/gallium/state_trackers/xvmc/tests/test_surface.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #include @@ -50,12 +50,12 @@ int main(int argc, char **argv) width, height, XVMC_CHROMA_FORMAT_420, - mc_types, - 2, - &port_num, - &surface_type_id, - &is_overlay, - &intra_unsigned + mc_types, + 2, + &port_num, + &surface_type_id, + &is_overlay, + &intra_unsigned )) { XCloseDisplay(display); diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/testlib.c b/src/gallium/state_trackers/xvmc/tests/testlib.c similarity index 99% rename from src/gallium/state_trackers/xorg/xvmc/tests/testlib.c rename to src/gallium/state_trackers/xvmc/tests/testlib.c index 142c09b..86d4b1c 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/testlib.c +++ b/src/gallium/state_trackers/xvmc/tests/testlib.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #include "testlib.h" diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/testlib.h b/src/gallium/state_trackers/xvmc/tests/testlib.h similarity index 99% rename from src/gallium/state_trackers/xorg/xvmc/tests/testlib.h rename to src/gallium/state_trackers/xvmc/tests/testlib.h index 0438e52..c27fc3c 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/testlib.h +++ b/src/gallium/state_trackers/xvmc/tests/testlib.h @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #ifndef testlib_h diff --git a/src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c b/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c similarity index 98% rename from src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c rename to src/gallium/state_trackers/xvmc/tests/xvmc_bench.c index bf94d85..4c37b8d 100644 --- a/src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c +++ b/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2009 Younes Manton. * All Rights Reserved. - * + * * 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 @@ -10,11 +10,11 @@ * distribute, sub license, 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 NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * 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. - * + * **************************************************************************/ #include @@ -205,12 +205,12 @@ int main(int argc, char **argv) config.input_width, config.input_height, XVMC_CHROMA_FORMAT_420, - mc_types, - 2, - &port_num, - &surface_type_id, - &is_overlay, - &intra_unsigned + mc_types, + 2, + &port_num, + &surface_type_id, + &is_overlay, + &intra_unsigned )) { XCloseDisplay(display); diff --git a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h b/src/gallium/state_trackers/xvmc/xvmc_private.h similarity index 100% rename from src/gallium/state_trackers/xorg/xvmc/xvmc_private.h rename to src/gallium/state_trackers/xvmc/xvmc_private.h diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc index 8c7b7f4..a46183e 100644 --- a/src/gallium/targets/Makefile.xvmc +++ b/src/gallium/targets/Makefile.xvmc @@ -12,7 +12,7 @@ INCLUDES = -I$(TOP)/src/gallium/include \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE $(DRIVER_DEFINES) LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lXv -lX11 -lm -STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/xorg/xvmc/libxvmctracker.a +STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/xvmc/libxvmctracker.a ifeq ($(MESA_LLVM),1) LDFLAGS += $(LLVM_LDFLAGS) @@ -29,7 +29,7 @@ endif # XXX: Hack, XvMC public funcs aren't exported if we link to libxvmctracker.a :( OBJECTS = $(C_SOURCES:.c=.o) \ $(ASM_SOURCES:.S=.o) \ - $(TOP)/src/gallium/state_trackers/xorg/xvmc/*.o + $(TOP)/src/gallium/state_trackers/xvmc/*.o ##### RULES ##### -- 2.7.4