st/xvmc: move xvmc state tracker out of xorg subdir

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 <[email protected]>

18 files changed, 82 insertions, 82 deletions

diff --git a/src/gallium/state_trackers/xorg/xvmc/Makefile b/src/gallium/state_trackers/xvmc/Makefile
index c4680995c66..179446f5ad5 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
index d40a7b1e6f4..d40a7b1e6f4 100644
--- a/src/gallium/state_trackers/xorg/xvmc/attributes.c
+++ b/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
index 64f8497e77c..64f8497e77c 100644
--- a/src/gallium/state_trackers/xorg/xvmc/block.c
+++ b/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
index e9ba06ba909..e9ba06ba909 100644
--- a/src/gallium/state_trackers/xorg/xvmc/context.c
+++ b/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
index d6be28ea3cd..6b1b091cf89 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
index 293e7ad22a4..834841cb3a0 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
index 9a8e05d9472..9a8e05d9472 100644
--- a/src/gallium/state_trackers/xorg/xvmc/tests/.gitignore
+++ b/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
index 88b03763563..fa19045ba72 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
index 994e3ca4d14..f8fc2f5ba1a 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 <assert.h>
@@ -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
index 3da957c9330..eed9a08895f 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 <assert.h>
@@ -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
index 94ac7d44a86..a7a6bda8e8d 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 <assert.h>
@@ -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
index 20d0907a07f..9683a1a2a44 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
index b65eb265c0a..1705a261e33 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 <assert.h>
@@ -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
index 142c09bb590..86d4b1c6c28 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
index 0438e52928b..c27fc3c79cc 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
index bf94d856234..4c37b8dade7 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 <assert.h>
@@ -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
index b9519a7e65d..b9519a7e65d 100644
--- a/src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
+++ b/src/gallium/state_trackers/xvmc/xvmc_private.h
diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc
index 8c7b7f4de5b..a46183e8de6 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 #####