From 91886f82a1155ca24eb895f77678ea1edfccf9fe Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Thu, 26 Mar 2009 10:51:05 +0800 Subject: [PATCH] xvmc: move 965 mc media programs to shader/mc directory Also include some missed g4i files in Makefile.am, fix shader build. --- configure.ac | 1 + src/xvmc/Makefile.am | 96 +------------------ src/xvmc/i965_xvmc.c | 32 +++---- src/xvmc/shader/Makefile.am | 2 +- src/xvmc/shader/mc/Makefile.am | 95 ++++++++++++++++++ src/xvmc/{ => shader/mc}/addidct.g4i | 0 src/xvmc/{ => shader/mc}/block_clear.g4i | 0 src/xvmc/{ => shader/mc}/dual_prime.g4a | 0 src/xvmc/{ => shader/mc}/dual_prime.g4b | 0 src/xvmc/{ => shader/mc}/dual_prime_igd.g4a | 0 src/xvmc/{ => shader/mc}/dual_prime_igd.g4b | 0 src/xvmc/{ => shader/mc}/field_backward.g4a | 0 src/xvmc/{ => shader/mc}/field_backward.g4b | 0 .../{ => shader/mc}/field_backward_igd.g4a | 0 .../{ => shader/mc}/field_backward_igd.g4b | 0 src/xvmc/{ => shader/mc}/field_f_b.g4a | 0 src/xvmc/{ => shader/mc}/field_f_b.g4b | 0 src/xvmc/{ => shader/mc}/field_f_b_igd.g4a | 0 src/xvmc/{ => shader/mc}/field_f_b_igd.g4b | 0 src/xvmc/{ => shader/mc}/field_forward.g4a | 0 src/xvmc/{ => shader/mc}/field_forward.g4b | 0 .../{ => shader/mc}/field_forward_igd.g4a | 0 .../{ => shader/mc}/field_forward_igd.g4b | 0 src/xvmc/{ => shader/mc}/frame_backward.g4a | 0 src/xvmc/{ => shader/mc}/frame_backward.g4b | 0 .../{ => shader/mc}/frame_backward_igd.g4a | 0 .../{ => shader/mc}/frame_backward_igd.g4b | 0 src/xvmc/{ => shader/mc}/frame_f_b.g4a | 0 src/xvmc/{ => shader/mc}/frame_f_b.g4b | 0 src/xvmc/{ => shader/mc}/frame_f_b_igd.g4a | 0 src/xvmc/{ => shader/mc}/frame_f_b_igd.g4b | 0 src/xvmc/{ => shader/mc}/frame_forward.g4a | 0 src/xvmc/{ => shader/mc}/frame_forward.g4b | 0 .../{ => shader/mc}/frame_forward_igd.g4a | 0 .../{ => shader/mc}/frame_forward_igd.g4b | 0 src/xvmc/{ => shader/mc}/ipicture.g4a | 0 src/xvmc/{ => shader/mc}/ipicture.g4b | 0 src/xvmc/{ => shader/mc}/motion_field_uv.g4i | 0 .../{ => shader/mc}/motion_field_uv_igd.g4i | 0 src/xvmc/{ => shader/mc}/motion_field_y.g4i | 0 .../{ => shader/mc}/motion_field_y_igd.g4i | 0 src/xvmc/{ => shader/mc}/motion_frame_uv.g4i | 0 .../{ => shader/mc}/motion_frame_uv_igd.g4i | 0 src/xvmc/{ => shader/mc}/motion_frame_y.g4i | 0 .../{ => shader/mc}/motion_frame_y_igd.g4i | 0 src/xvmc/{ => shader/mc}/null.g4a | 0 src/xvmc/{ => shader/mc}/null.g4b | 0 .../{ => shader/mc}/read_field_x0y0_uv.g4i | 0 .../mc}/read_field_x0y0_uv_igd.g4i | 0 .../{ => shader/mc}/read_field_x0y0_y.g4i | 0 .../{ => shader/mc}/read_field_x0y0_y_igd.g4i | 0 .../{ => shader/mc}/read_field_x0y1_uv.g4i | 0 .../mc}/read_field_x0y1_uv_igd.g4i | 0 .../{ => shader/mc}/read_field_x0y1_y.g4i | 0 .../{ => shader/mc}/read_field_x0y1_y_igd.g4i | 0 .../{ => shader/mc}/read_field_x1y0_uv.g4i | 0 .../mc}/read_field_x1y0_uv_igd.g4i | 0 .../{ => shader/mc}/read_field_x1y0_y.g4i | 0 .../{ => shader/mc}/read_field_x1y0_y_igd.g4i | 0 .../{ => shader/mc}/read_field_x1y1_uv.g4i | 0 .../mc}/read_field_x1y1_uv_igd.g4i | 0 .../{ => shader/mc}/read_field_x1y1_y.g4i | 0 .../{ => shader/mc}/read_field_x1y1_y_igd.g4i | 0 .../{ => shader/mc}/read_frame_x0y0_uv.g4i | 0 .../mc}/read_frame_x0y0_uv_igd.g4i | 0 .../{ => shader/mc}/read_frame_x0y0_y.g4i | 0 .../{ => shader/mc}/read_frame_x0y0_y_igd.g4i | 0 .../{ => shader/mc}/read_frame_x0y1_uv.g4i | 0 .../mc}/read_frame_x0y1_uv_igd.g4i | 0 .../{ => shader/mc}/read_frame_x0y1_y.g4i | 0 .../{ => shader/mc}/read_frame_x0y1_y_igd.g4i | 0 .../{ => shader/mc}/read_frame_x1y0_uv.g4i | 0 .../mc}/read_frame_x1y0_uv_igd.g4i | 0 .../{ => shader/mc}/read_frame_x1y0_y.g4i | 0 .../{ => shader/mc}/read_frame_x1y0_y_igd.g4i | 0 .../{ => shader/mc}/read_frame_x1y1_uv.g4i | 0 .../mc}/read_frame_x1y1_uv_igd.g4i | 0 .../{ => shader/mc}/read_frame_x1y1_y.g4i | 0 .../{ => shader/mc}/read_frame_x1y1_y_igd.g4i | 0 79 files changed, 114 insertions(+), 112 deletions(-) create mode 100644 src/xvmc/shader/mc/Makefile.am rename src/xvmc/{ => shader/mc}/addidct.g4i (100%) rename src/xvmc/{ => shader/mc}/block_clear.g4i (100%) rename src/xvmc/{ => shader/mc}/dual_prime.g4a (100%) rename src/xvmc/{ => shader/mc}/dual_prime.g4b (100%) rename src/xvmc/{ => shader/mc}/dual_prime_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/dual_prime_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/field_backward.g4a (100%) rename src/xvmc/{ => shader/mc}/field_backward.g4b (100%) rename src/xvmc/{ => shader/mc}/field_backward_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/field_backward_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/field_f_b.g4a (100%) rename src/xvmc/{ => shader/mc}/field_f_b.g4b (100%) rename src/xvmc/{ => shader/mc}/field_f_b_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/field_f_b_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/field_forward.g4a (100%) rename src/xvmc/{ => shader/mc}/field_forward.g4b (100%) rename src/xvmc/{ => shader/mc}/field_forward_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/field_forward_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/frame_backward.g4a (100%) rename src/xvmc/{ => shader/mc}/frame_backward.g4b (100%) rename src/xvmc/{ => shader/mc}/frame_backward_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/frame_backward_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/frame_f_b.g4a (100%) rename src/xvmc/{ => shader/mc}/frame_f_b.g4b (100%) rename src/xvmc/{ => shader/mc}/frame_f_b_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/frame_f_b_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/frame_forward.g4a (100%) rename src/xvmc/{ => shader/mc}/frame_forward.g4b (100%) rename src/xvmc/{ => shader/mc}/frame_forward_igd.g4a (100%) rename src/xvmc/{ => shader/mc}/frame_forward_igd.g4b (100%) rename src/xvmc/{ => shader/mc}/ipicture.g4a (100%) rename src/xvmc/{ => shader/mc}/ipicture.g4b (100%) rename src/xvmc/{ => shader/mc}/motion_field_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_field_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_field_y.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_field_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_frame_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_frame_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_frame_y.g4i (100%) rename src/xvmc/{ => shader/mc}/motion_frame_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/null.g4a (100%) rename src/xvmc/{ => shader/mc}/null.g4b (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y0_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y0_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y0_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y0_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y1_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y1_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y1_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x0y1_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y0_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y0_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y0_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y0_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y1_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y1_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y1_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_field_x1y1_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y0_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y0_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y0_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y0_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y1_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y1_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y1_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x0y1_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y0_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y0_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y0_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y0_y_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y1_uv.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y1_uv_igd.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y1_y.g4i (100%) rename src/xvmc/{ => shader/mc}/read_frame_x1y1_y_igd.g4i (100%) diff --git a/configure.ac b/configure.ac index dc9de8c0..2414a070 100644 --- a/configure.ac +++ b/configure.ac @@ -272,6 +272,7 @@ AC_OUTPUT([ src/Makefile src/xvmc/Makefile src/xvmc/shader/Makefile + src/xvmc/shader/mc/Makefile src/xvmc/shader/vld/Makefile src/bios_reader/Makefile src/ch7017/Makefile diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am index d8c539e4..f4587d1d 100644 --- a/src/xvmc/Makefile.am +++ b/src/xvmc/Makefile.am @@ -3,6 +3,7 @@ lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la endif SUBDIRS = shader + libI810XvMC_la_SOURCES = I810XvMC.c \ I810XvMC.h @@ -32,98 +33,3 @@ libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0 libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread - -INTEL_G4A = \ - dual_prime_igd.g4a \ - field_backward_igd.g4a \ - field_f_b_igd.g4a \ - field_forward_igd.g4a \ - frame_backward_igd.g4a \ - frame_f_b_igd.g4a \ - frame_forward_igd.g4a \ - dual_prime.g4a \ - field_backward.g4a \ - field_f_b.g4a \ - field_forward.g4a \ - frame_backward.g4a \ - frame_f_b.g4a \ - frame_forward.g4a \ - ipicture.g4a \ - null.g4a - -INTEL_G4I = \ - addidct.g4i \ - block_clear.g4i \ - read_frame_x0y0_y.g4i \ - read_frame_x0y1_y.g4i \ - read_frame_x1y0_y.g4i \ - read_frame_x1y1_y.g4i \ - read_frame_x0y0_uv.g4i \ - read_frame_x0y1_uv.g4i \ - read_frame_x1y0_uv.g4i \ - read_frame_x1y1_uv.g4i \ - read_frame_x0y0_y_igd.g4i \ - read_frame_x0y1_y_igd.g4i \ - read_frame_x1y0_y_igd.g4i \ - read_frame_x1y1_y_igd.g4i \ - read_frame_x0y0_uv_igd.g4i \ - read_frame_x0y1_uv_igd.g4i \ - read_frame_x1y0_uv_igd.g4i \ - read_frame_x1y1_uv_igd.g4i \ - motion_frame_y.g4i \ - motion_frame_uv.g4i \ - read_field_x0y0_y.g4i \ - read_field_x0y1_y.g4i \ - read_field_x1y0_y.g4i \ - read_field_x1y1_y.g4i \ - read_field_x0y0_uv.g4i \ - read_field_x0y1_uv.g4i \ - read_field_x1y0_uv.g4i \ - read_field_x1y1_uv.g4i \ - read_field_x0y0_y_igd.g4i \ - read_field_x0y1_y_igd.g4i \ - read_field_x1y0_y_igd.g4i \ - read_field_x1y1_y_igd.g4i \ - read_field_x0y0_uv_igd.g4i \ - read_field_x0y1_uv_igd.g4i \ - read_field_x1y0_uv_igd.g4i \ - read_field_x1y1_uv_igd.g4i \ - motion_field_y.g4i \ - motion_field_uv.g4i - -INTEL_G4B = \ - dual_prime.g4b \ - field_backward.g4b \ - field_f_b.g4b \ - field_forward.g4b \ - frame_backward.g4b \ - frame_f_b.g4b \ - frame_forward.g4b \ - dual_prime_igd.g4b \ - field_backward_igd.g4b \ - field_f_b_igd.g4b \ - field_forward_igd.g4b \ - frame_backward_igd.g4b \ - frame_f_b_igd.g4b \ - frame_forward_igd.g4b \ - ipicture.g4b \ - null.g4b - -EXTRA_DIST = \ - $(INTEL_G4A) \ - $(INTEL_G4I) \ - $(INTEL_G4B) - -if HAVE_GEN4ASM - -SUFFIXES = .g4a .g4b -.g4a.g4b: - m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m - -$(INTEL_G4B): $(INTEL_G4I) - -BUILT_SOURCES= $(INTEL_G4B) - -clean-local: - -rm -f $(INTEL_G4B) -endif diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c index 1ffda27b..4b1c4812 100644 --- a/src/xvmc/i965_xvmc.c +++ b/src/xvmc/i965_xvmc.c @@ -46,52 +46,52 @@ enum interface { }; static const uint32_t ipicture_kernel_static[][4] = { - #include "ipicture.g4b" + #include "shader/mc/ipicture.g4b" }; static const uint32_t null_kernel_static[][4] = { - #include "null.g4b" + #include "shader/mc/null.g4b" }; static const uint32_t frame_forward_kernel_static[][4] = { - #include "frame_forward.g4b" + #include "shader/mc/frame_forward.g4b" }; static const uint32_t frame_backward_kernel_static[][4] = { - #include "frame_backward.g4b" + #include "shader/mc/frame_backward.g4b" }; static const uint32_t frame_f_b_kernel_static[][4] = { - #include "frame_f_b.g4b" + #include "shader/mc/frame_f_b.g4b" }; static const uint32_t field_forward_kernel_static[][4] = { - #include "field_forward.g4b" + #include "shader/mc/field_forward.g4b" }; static const uint32_t field_backward_kernel_static[][4] = { - #include "field_backward.g4b" + #include "shader/mc/field_backward.g4b" }; static const uint32_t field_f_b_kernel_static[][4] = { - #include "field_f_b.g4b" + #include "shader/mc/field_f_b.g4b" }; static const uint32_t dual_prime_kernel_static[][4]= { - #include "dual_prime.g4b" + #include "shader/mc/dual_prime.g4b" }; static const uint32_t frame_forward_igd_kernel_static[][4] = { - #include "frame_forward_igd.g4b" + #include "shader/mc/frame_forward_igd.g4b" }; static const uint32_t frame_backward_igd_kernel_static[][4] = { - #include "frame_backward_igd.g4b" + #include "shader/mc/frame_backward_igd.g4b" }; static const uint32_t frame_f_b_igd_kernel_static[][4] = { - #include "frame_f_b_igd.g4b" + #include "shader/mc/frame_f_b_igd.g4b" }; static const uint32_t field_forward_igd_kernel_static[][4] = { - #include "field_forward_igd.g4b" + #include "shader/mc/field_forward_igd.g4b" }; static const uint32_t field_backward_igd_kernel_static[][4] = { - #include "field_backward_igd.g4b" + #include "shader/mc/field_backward_igd.g4b" }; static const uint32_t field_f_b_igd_kernel_static[][4] = { - #include "field_f_b_igd.g4b" + #include "shader/mc/field_f_b_igd.g4b" }; static const uint32_t dual_prime_igd_kernel_static[][4]= { - #include "dual_prime_igd.g4b" + #include "shader/mc/dual_prime_igd.g4b" }; #define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1)) diff --git a/src/xvmc/shader/Makefile.am b/src/xvmc/shader/Makefile.am index 1a27c83b..2a58cfde 100644 --- a/src/xvmc/shader/Makefile.am +++ b/src/xvmc/shader/Makefile.am @@ -1 +1 @@ -SUBDIRS = vld +SUBDIRS = mc vld diff --git a/src/xvmc/shader/mc/Makefile.am b/src/xvmc/shader/mc/Makefile.am new file mode 100644 index 00000000..b4d6c4ac --- /dev/null +++ b/src/xvmc/shader/mc/Makefile.am @@ -0,0 +1,95 @@ + +INTEL_G4A = dual_prime_igd.g4a \ + field_backward_igd.g4a \ + field_f_b_igd.g4a \ + field_forward_igd.g4a \ + frame_backward_igd.g4a \ + frame_f_b_igd.g4a \ + frame_forward_igd.g4a \ + dual_prime.g4a \ + field_backward.g4a \ + field_f_b.g4a \ + field_forward.g4a \ + frame_backward.g4a \ + frame_f_b.g4a \ + frame_forward.g4a \ + ipicture.g4a \ + null.g4a + +INTEL_G4I = addidct.g4i \ + block_clear.g4i \ + read_frame_x0y0_y.g4i \ + read_frame_x0y1_y.g4i \ + read_frame_x1y0_y.g4i \ + read_frame_x1y1_y.g4i \ + read_frame_x0y0_uv.g4i \ + read_frame_x0y1_uv.g4i \ + read_frame_x1y0_uv.g4i \ + read_frame_x1y1_uv.g4i \ + read_frame_x0y0_y_igd.g4i \ + read_frame_x0y1_y_igd.g4i \ + read_frame_x1y0_y_igd.g4i \ + read_frame_x1y1_y_igd.g4i \ + read_frame_x0y0_uv_igd.g4i \ + read_frame_x0y1_uv_igd.g4i \ + read_frame_x1y0_uv_igd.g4i \ + read_frame_x1y1_uv_igd.g4i \ + motion_frame_y.g4i \ + motion_frame_uv.g4i \ + read_field_x0y0_y.g4i \ + read_field_x0y1_y.g4i \ + read_field_x1y0_y.g4i \ + read_field_x1y1_y.g4i \ + read_field_x0y0_uv.g4i \ + read_field_x0y1_uv.g4i \ + read_field_x1y0_uv.g4i \ + read_field_x1y1_uv.g4i \ + read_field_x0y0_y_igd.g4i \ + read_field_x0y1_y_igd.g4i \ + read_field_x1y0_y_igd.g4i \ + read_field_x1y1_y_igd.g4i \ + read_field_x0y0_uv_igd.g4i \ + read_field_x0y1_uv_igd.g4i \ + read_field_x1y0_uv_igd.g4i \ + read_field_x1y1_uv_igd.g4i \ + motion_field_y.g4i \ + motion_field_uv.g4i \ + motion_field_uv_igd.g4i \ + motion_field_y_igd.g4i \ + motion_frame_uv_igd.g4i \ + motion_frame_y_igd.g4i + +INTEL_G4B = dual_prime.g4b \ + field_backward.g4b \ + field_f_b.g4b \ + field_forward.g4b \ + frame_backward.g4b \ + frame_f_b.g4b \ + frame_forward.g4b \ + dual_prime_igd.g4b \ + field_backward_igd.g4b \ + field_f_b_igd.g4b \ + field_forward_igd.g4b \ + frame_backward_igd.g4b \ + frame_f_b_igd.g4b \ + frame_forward_igd.g4b \ + ipicture.g4b \ + null.g4b + +EXTRA_DIST = $(INTEL_G4A) \ + $(INTEL_G4I) \ + $(INTEL_G4B) + +if HAVE_GEN4ASM + +SUFFIXES = .g4a .g4b +.g4a.g4b: + m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m + +$(INTEL_G4B): $(INTEL_G4I) + +BUILT_SOURCES= $(INTEL_G4B) + +clean-local: + -rm -f $(INTEL_G4B) +endif diff --git a/src/xvmc/addidct.g4i b/src/xvmc/shader/mc/addidct.g4i similarity index 100% rename from src/xvmc/addidct.g4i rename to src/xvmc/shader/mc/addidct.g4i diff --git a/src/xvmc/block_clear.g4i b/src/xvmc/shader/mc/block_clear.g4i similarity index 100% rename from src/xvmc/block_clear.g4i rename to src/xvmc/shader/mc/block_clear.g4i diff --git a/src/xvmc/dual_prime.g4a b/src/xvmc/shader/mc/dual_prime.g4a similarity index 100% rename from src/xvmc/dual_prime.g4a rename to src/xvmc/shader/mc/dual_prime.g4a diff --git a/src/xvmc/dual_prime.g4b b/src/xvmc/shader/mc/dual_prime.g4b similarity index 100% rename from src/xvmc/dual_prime.g4b rename to src/xvmc/shader/mc/dual_prime.g4b diff --git a/src/xvmc/dual_prime_igd.g4a b/src/xvmc/shader/mc/dual_prime_igd.g4a similarity index 100% rename from src/xvmc/dual_prime_igd.g4a rename to src/xvmc/shader/mc/dual_prime_igd.g4a diff --git a/src/xvmc/dual_prime_igd.g4b b/src/xvmc/shader/mc/dual_prime_igd.g4b similarity index 100% rename from src/xvmc/dual_prime_igd.g4b rename to src/xvmc/shader/mc/dual_prime_igd.g4b diff --git a/src/xvmc/field_backward.g4a b/src/xvmc/shader/mc/field_backward.g4a similarity index 100% rename from src/xvmc/field_backward.g4a rename to src/xvmc/shader/mc/field_backward.g4a diff --git a/src/xvmc/field_backward.g4b b/src/xvmc/shader/mc/field_backward.g4b similarity index 100% rename from src/xvmc/field_backward.g4b rename to src/xvmc/shader/mc/field_backward.g4b diff --git a/src/xvmc/field_backward_igd.g4a b/src/xvmc/shader/mc/field_backward_igd.g4a similarity index 100% rename from src/xvmc/field_backward_igd.g4a rename to src/xvmc/shader/mc/field_backward_igd.g4a diff --git a/src/xvmc/field_backward_igd.g4b b/src/xvmc/shader/mc/field_backward_igd.g4b similarity index 100% rename from src/xvmc/field_backward_igd.g4b rename to src/xvmc/shader/mc/field_backward_igd.g4b diff --git a/src/xvmc/field_f_b.g4a b/src/xvmc/shader/mc/field_f_b.g4a similarity index 100% rename from src/xvmc/field_f_b.g4a rename to src/xvmc/shader/mc/field_f_b.g4a diff --git a/src/xvmc/field_f_b.g4b b/src/xvmc/shader/mc/field_f_b.g4b similarity index 100% rename from src/xvmc/field_f_b.g4b rename to src/xvmc/shader/mc/field_f_b.g4b diff --git a/src/xvmc/field_f_b_igd.g4a b/src/xvmc/shader/mc/field_f_b_igd.g4a similarity index 100% rename from src/xvmc/field_f_b_igd.g4a rename to src/xvmc/shader/mc/field_f_b_igd.g4a diff --git a/src/xvmc/field_f_b_igd.g4b b/src/xvmc/shader/mc/field_f_b_igd.g4b similarity index 100% rename from src/xvmc/field_f_b_igd.g4b rename to src/xvmc/shader/mc/field_f_b_igd.g4b diff --git a/src/xvmc/field_forward.g4a b/src/xvmc/shader/mc/field_forward.g4a similarity index 100% rename from src/xvmc/field_forward.g4a rename to src/xvmc/shader/mc/field_forward.g4a diff --git a/src/xvmc/field_forward.g4b b/src/xvmc/shader/mc/field_forward.g4b similarity index 100% rename from src/xvmc/field_forward.g4b rename to src/xvmc/shader/mc/field_forward.g4b diff --git a/src/xvmc/field_forward_igd.g4a b/src/xvmc/shader/mc/field_forward_igd.g4a similarity index 100% rename from src/xvmc/field_forward_igd.g4a rename to src/xvmc/shader/mc/field_forward_igd.g4a diff --git a/src/xvmc/field_forward_igd.g4b b/src/xvmc/shader/mc/field_forward_igd.g4b similarity index 100% rename from src/xvmc/field_forward_igd.g4b rename to src/xvmc/shader/mc/field_forward_igd.g4b diff --git a/src/xvmc/frame_backward.g4a b/src/xvmc/shader/mc/frame_backward.g4a similarity index 100% rename from src/xvmc/frame_backward.g4a rename to src/xvmc/shader/mc/frame_backward.g4a diff --git a/src/xvmc/frame_backward.g4b b/src/xvmc/shader/mc/frame_backward.g4b similarity index 100% rename from src/xvmc/frame_backward.g4b rename to src/xvmc/shader/mc/frame_backward.g4b diff --git a/src/xvmc/frame_backward_igd.g4a b/src/xvmc/shader/mc/frame_backward_igd.g4a similarity index 100% rename from src/xvmc/frame_backward_igd.g4a rename to src/xvmc/shader/mc/frame_backward_igd.g4a diff --git a/src/xvmc/frame_backward_igd.g4b b/src/xvmc/shader/mc/frame_backward_igd.g4b similarity index 100% rename from src/xvmc/frame_backward_igd.g4b rename to src/xvmc/shader/mc/frame_backward_igd.g4b diff --git a/src/xvmc/frame_f_b.g4a b/src/xvmc/shader/mc/frame_f_b.g4a similarity index 100% rename from src/xvmc/frame_f_b.g4a rename to src/xvmc/shader/mc/frame_f_b.g4a diff --git a/src/xvmc/frame_f_b.g4b b/src/xvmc/shader/mc/frame_f_b.g4b similarity index 100% rename from src/xvmc/frame_f_b.g4b rename to src/xvmc/shader/mc/frame_f_b.g4b diff --git a/src/xvmc/frame_f_b_igd.g4a b/src/xvmc/shader/mc/frame_f_b_igd.g4a similarity index 100% rename from src/xvmc/frame_f_b_igd.g4a rename to src/xvmc/shader/mc/frame_f_b_igd.g4a diff --git a/src/xvmc/frame_f_b_igd.g4b b/src/xvmc/shader/mc/frame_f_b_igd.g4b similarity index 100% rename from src/xvmc/frame_f_b_igd.g4b rename to src/xvmc/shader/mc/frame_f_b_igd.g4b diff --git a/src/xvmc/frame_forward.g4a b/src/xvmc/shader/mc/frame_forward.g4a similarity index 100% rename from src/xvmc/frame_forward.g4a rename to src/xvmc/shader/mc/frame_forward.g4a diff --git a/src/xvmc/frame_forward.g4b b/src/xvmc/shader/mc/frame_forward.g4b similarity index 100% rename from src/xvmc/frame_forward.g4b rename to src/xvmc/shader/mc/frame_forward.g4b diff --git a/src/xvmc/frame_forward_igd.g4a b/src/xvmc/shader/mc/frame_forward_igd.g4a similarity index 100% rename from src/xvmc/frame_forward_igd.g4a rename to src/xvmc/shader/mc/frame_forward_igd.g4a diff --git a/src/xvmc/frame_forward_igd.g4b b/src/xvmc/shader/mc/frame_forward_igd.g4b similarity index 100% rename from src/xvmc/frame_forward_igd.g4b rename to src/xvmc/shader/mc/frame_forward_igd.g4b diff --git a/src/xvmc/ipicture.g4a b/src/xvmc/shader/mc/ipicture.g4a similarity index 100% rename from src/xvmc/ipicture.g4a rename to src/xvmc/shader/mc/ipicture.g4a diff --git a/src/xvmc/ipicture.g4b b/src/xvmc/shader/mc/ipicture.g4b similarity index 100% rename from src/xvmc/ipicture.g4b rename to src/xvmc/shader/mc/ipicture.g4b diff --git a/src/xvmc/motion_field_uv.g4i b/src/xvmc/shader/mc/motion_field_uv.g4i similarity index 100% rename from src/xvmc/motion_field_uv.g4i rename to src/xvmc/shader/mc/motion_field_uv.g4i diff --git a/src/xvmc/motion_field_uv_igd.g4i b/src/xvmc/shader/mc/motion_field_uv_igd.g4i similarity index 100% rename from src/xvmc/motion_field_uv_igd.g4i rename to src/xvmc/shader/mc/motion_field_uv_igd.g4i diff --git a/src/xvmc/motion_field_y.g4i b/src/xvmc/shader/mc/motion_field_y.g4i similarity index 100% rename from src/xvmc/motion_field_y.g4i rename to src/xvmc/shader/mc/motion_field_y.g4i diff --git a/src/xvmc/motion_field_y_igd.g4i b/src/xvmc/shader/mc/motion_field_y_igd.g4i similarity index 100% rename from src/xvmc/motion_field_y_igd.g4i rename to src/xvmc/shader/mc/motion_field_y_igd.g4i diff --git a/src/xvmc/motion_frame_uv.g4i b/src/xvmc/shader/mc/motion_frame_uv.g4i similarity index 100% rename from src/xvmc/motion_frame_uv.g4i rename to src/xvmc/shader/mc/motion_frame_uv.g4i diff --git a/src/xvmc/motion_frame_uv_igd.g4i b/src/xvmc/shader/mc/motion_frame_uv_igd.g4i similarity index 100% rename from src/xvmc/motion_frame_uv_igd.g4i rename to src/xvmc/shader/mc/motion_frame_uv_igd.g4i diff --git a/src/xvmc/motion_frame_y.g4i b/src/xvmc/shader/mc/motion_frame_y.g4i similarity index 100% rename from src/xvmc/motion_frame_y.g4i rename to src/xvmc/shader/mc/motion_frame_y.g4i diff --git a/src/xvmc/motion_frame_y_igd.g4i b/src/xvmc/shader/mc/motion_frame_y_igd.g4i similarity index 100% rename from src/xvmc/motion_frame_y_igd.g4i rename to src/xvmc/shader/mc/motion_frame_y_igd.g4i diff --git a/src/xvmc/null.g4a b/src/xvmc/shader/mc/null.g4a similarity index 100% rename from src/xvmc/null.g4a rename to src/xvmc/shader/mc/null.g4a diff --git a/src/xvmc/null.g4b b/src/xvmc/shader/mc/null.g4b similarity index 100% rename from src/xvmc/null.g4b rename to src/xvmc/shader/mc/null.g4b diff --git a/src/xvmc/read_field_x0y0_uv.g4i b/src/xvmc/shader/mc/read_field_x0y0_uv.g4i similarity index 100% rename from src/xvmc/read_field_x0y0_uv.g4i rename to src/xvmc/shader/mc/read_field_x0y0_uv.g4i diff --git a/src/xvmc/read_field_x0y0_uv_igd.g4i b/src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i similarity index 100% rename from src/xvmc/read_field_x0y0_uv_igd.g4i rename to src/xvmc/shader/mc/read_field_x0y0_uv_igd.g4i diff --git a/src/xvmc/read_field_x0y0_y.g4i b/src/xvmc/shader/mc/read_field_x0y0_y.g4i similarity index 100% rename from src/xvmc/read_field_x0y0_y.g4i rename to src/xvmc/shader/mc/read_field_x0y0_y.g4i diff --git a/src/xvmc/read_field_x0y0_y_igd.g4i b/src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i similarity index 100% rename from src/xvmc/read_field_x0y0_y_igd.g4i rename to src/xvmc/shader/mc/read_field_x0y0_y_igd.g4i diff --git a/src/xvmc/read_field_x0y1_uv.g4i b/src/xvmc/shader/mc/read_field_x0y1_uv.g4i similarity index 100% rename from src/xvmc/read_field_x0y1_uv.g4i rename to src/xvmc/shader/mc/read_field_x0y1_uv.g4i diff --git a/src/xvmc/read_field_x0y1_uv_igd.g4i b/src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i similarity index 100% rename from src/xvmc/read_field_x0y1_uv_igd.g4i rename to src/xvmc/shader/mc/read_field_x0y1_uv_igd.g4i diff --git a/src/xvmc/read_field_x0y1_y.g4i b/src/xvmc/shader/mc/read_field_x0y1_y.g4i similarity index 100% rename from src/xvmc/read_field_x0y1_y.g4i rename to src/xvmc/shader/mc/read_field_x0y1_y.g4i diff --git a/src/xvmc/read_field_x0y1_y_igd.g4i b/src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i similarity index 100% rename from src/xvmc/read_field_x0y1_y_igd.g4i rename to src/xvmc/shader/mc/read_field_x0y1_y_igd.g4i diff --git a/src/xvmc/read_field_x1y0_uv.g4i b/src/xvmc/shader/mc/read_field_x1y0_uv.g4i similarity index 100% rename from src/xvmc/read_field_x1y0_uv.g4i rename to src/xvmc/shader/mc/read_field_x1y0_uv.g4i diff --git a/src/xvmc/read_field_x1y0_uv_igd.g4i b/src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i similarity index 100% rename from src/xvmc/read_field_x1y0_uv_igd.g4i rename to src/xvmc/shader/mc/read_field_x1y0_uv_igd.g4i diff --git a/src/xvmc/read_field_x1y0_y.g4i b/src/xvmc/shader/mc/read_field_x1y0_y.g4i similarity index 100% rename from src/xvmc/read_field_x1y0_y.g4i rename to src/xvmc/shader/mc/read_field_x1y0_y.g4i diff --git a/src/xvmc/read_field_x1y0_y_igd.g4i b/src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i similarity index 100% rename from src/xvmc/read_field_x1y0_y_igd.g4i rename to src/xvmc/shader/mc/read_field_x1y0_y_igd.g4i diff --git a/src/xvmc/read_field_x1y1_uv.g4i b/src/xvmc/shader/mc/read_field_x1y1_uv.g4i similarity index 100% rename from src/xvmc/read_field_x1y1_uv.g4i rename to src/xvmc/shader/mc/read_field_x1y1_uv.g4i diff --git a/src/xvmc/read_field_x1y1_uv_igd.g4i b/src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i similarity index 100% rename from src/xvmc/read_field_x1y1_uv_igd.g4i rename to src/xvmc/shader/mc/read_field_x1y1_uv_igd.g4i diff --git a/src/xvmc/read_field_x1y1_y.g4i b/src/xvmc/shader/mc/read_field_x1y1_y.g4i similarity index 100% rename from src/xvmc/read_field_x1y1_y.g4i rename to src/xvmc/shader/mc/read_field_x1y1_y.g4i diff --git a/src/xvmc/read_field_x1y1_y_igd.g4i b/src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i similarity index 100% rename from src/xvmc/read_field_x1y1_y_igd.g4i rename to src/xvmc/shader/mc/read_field_x1y1_y_igd.g4i diff --git a/src/xvmc/read_frame_x0y0_uv.g4i b/src/xvmc/shader/mc/read_frame_x0y0_uv.g4i similarity index 100% rename from src/xvmc/read_frame_x0y0_uv.g4i rename to src/xvmc/shader/mc/read_frame_x0y0_uv.g4i diff --git a/src/xvmc/read_frame_x0y0_uv_igd.g4i b/src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x0y0_uv_igd.g4i rename to src/xvmc/shader/mc/read_frame_x0y0_uv_igd.g4i diff --git a/src/xvmc/read_frame_x0y0_y.g4i b/src/xvmc/shader/mc/read_frame_x0y0_y.g4i similarity index 100% rename from src/xvmc/read_frame_x0y0_y.g4i rename to src/xvmc/shader/mc/read_frame_x0y0_y.g4i diff --git a/src/xvmc/read_frame_x0y0_y_igd.g4i b/src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x0y0_y_igd.g4i rename to src/xvmc/shader/mc/read_frame_x0y0_y_igd.g4i diff --git a/src/xvmc/read_frame_x0y1_uv.g4i b/src/xvmc/shader/mc/read_frame_x0y1_uv.g4i similarity index 100% rename from src/xvmc/read_frame_x0y1_uv.g4i rename to src/xvmc/shader/mc/read_frame_x0y1_uv.g4i diff --git a/src/xvmc/read_frame_x0y1_uv_igd.g4i b/src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x0y1_uv_igd.g4i rename to src/xvmc/shader/mc/read_frame_x0y1_uv_igd.g4i diff --git a/src/xvmc/read_frame_x0y1_y.g4i b/src/xvmc/shader/mc/read_frame_x0y1_y.g4i similarity index 100% rename from src/xvmc/read_frame_x0y1_y.g4i rename to src/xvmc/shader/mc/read_frame_x0y1_y.g4i diff --git a/src/xvmc/read_frame_x0y1_y_igd.g4i b/src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x0y1_y_igd.g4i rename to src/xvmc/shader/mc/read_frame_x0y1_y_igd.g4i diff --git a/src/xvmc/read_frame_x1y0_uv.g4i b/src/xvmc/shader/mc/read_frame_x1y0_uv.g4i similarity index 100% rename from src/xvmc/read_frame_x1y0_uv.g4i rename to src/xvmc/shader/mc/read_frame_x1y0_uv.g4i diff --git a/src/xvmc/read_frame_x1y0_uv_igd.g4i b/src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x1y0_uv_igd.g4i rename to src/xvmc/shader/mc/read_frame_x1y0_uv_igd.g4i diff --git a/src/xvmc/read_frame_x1y0_y.g4i b/src/xvmc/shader/mc/read_frame_x1y0_y.g4i similarity index 100% rename from src/xvmc/read_frame_x1y0_y.g4i rename to src/xvmc/shader/mc/read_frame_x1y0_y.g4i diff --git a/src/xvmc/read_frame_x1y0_y_igd.g4i b/src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x1y0_y_igd.g4i rename to src/xvmc/shader/mc/read_frame_x1y0_y_igd.g4i diff --git a/src/xvmc/read_frame_x1y1_uv.g4i b/src/xvmc/shader/mc/read_frame_x1y1_uv.g4i similarity index 100% rename from src/xvmc/read_frame_x1y1_uv.g4i rename to src/xvmc/shader/mc/read_frame_x1y1_uv.g4i diff --git a/src/xvmc/read_frame_x1y1_uv_igd.g4i b/src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x1y1_uv_igd.g4i rename to src/xvmc/shader/mc/read_frame_x1y1_uv_igd.g4i diff --git a/src/xvmc/read_frame_x1y1_y.g4i b/src/xvmc/shader/mc/read_frame_x1y1_y.g4i similarity index 100% rename from src/xvmc/read_frame_x1y1_y.g4i rename to src/xvmc/shader/mc/read_frame_x1y1_y.g4i diff --git a/src/xvmc/read_frame_x1y1_y_igd.g4i b/src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i similarity index 100% rename from src/xvmc/read_frame_x1y1_y_igd.g4i rename to src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i