xvmc: move 965 mc media programs to shader/mc directory

Also include some missed g4i files in Makefile.am, fix shader build.

78 files changed, 113 insertions, 112 deletions

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
index bd3d5fe5..bd3d5fe5 100644
--- a/src/xvmc/addidct.g4i
+++ b/src/xvmc/shader/mc/addidct.g4i
diff --git a/src/xvmc/block_clear.g4i b/src/xvmc/shader/mc/block_clear.g4i
index ce12f3b5..ce12f3b5 100644
--- a/src/xvmc/block_clear.g4i
+++ b/src/xvmc/shader/mc/block_clear.g4i
diff --git a/src/xvmc/dual_prime.g4a b/src/xvmc/shader/mc/dual_prime.g4a
index 7066a75b..7066a75b 100644
--- a/src/xvmc/dual_prime.g4a
+++ b/src/xvmc/shader/mc/dual_prime.g4a
diff --git a/src/xvmc/dual_prime.g4b b/src/xvmc/shader/mc/dual_prime.g4b
index 4a1eb4be..4a1eb4be 100644
--- a/src/xvmc/dual_prime.g4b
+++ b/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
index e741244b..e741244b 100644
--- a/src/xvmc/dual_prime_igd.g4a
+++ b/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
index 6477d066..6477d066 100644
--- a/src/xvmc/dual_prime_igd.g4b
+++ b/src/xvmc/shader/mc/dual_prime_igd.g4b
diff --git a/src/xvmc/field_backward.g4a b/src/xvmc/shader/mc/field_backward.g4a
index 8c721c62..8c721c62 100644
--- a/src/xvmc/field_backward.g4a
+++ b/src/xvmc/shader/mc/field_backward.g4a
diff --git a/src/xvmc/field_backward.g4b b/src/xvmc/shader/mc/field_backward.g4b
index cce7d454..cce7d454 100644
--- a/src/xvmc/field_backward.g4b
+++ b/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
index d01b8dc3..d01b8dc3 100644
--- a/src/xvmc/field_backward_igd.g4a
+++ b/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
index 7382a872..7382a872 100644
--- a/src/xvmc/field_backward_igd.g4b
+++ b/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
index 7066a75b..7066a75b 100644
--- a/src/xvmc/field_f_b.g4a
+++ b/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
index 4a1eb4be..4a1eb4be 100644
--- a/src/xvmc/field_f_b.g4b
+++ b/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
index e741244b..e741244b 100644
--- a/src/xvmc/field_f_b_igd.g4a
+++ b/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
index 6477d066..6477d066 100644
--- a/src/xvmc/field_f_b_igd.g4b
+++ b/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
index f5595ee1..f5595ee1 100644
--- a/src/xvmc/field_forward.g4a
+++ b/src/xvmc/shader/mc/field_forward.g4a
diff --git a/src/xvmc/field_forward.g4b b/src/xvmc/shader/mc/field_forward.g4b
index 3514c868..3514c868 100644
--- a/src/xvmc/field_forward.g4b
+++ b/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
index fdd49251..fdd49251 100644
--- a/src/xvmc/field_forward_igd.g4a
+++ b/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
index 6d1dee5c..6d1dee5c 100644
--- a/src/xvmc/field_forward_igd.g4b
+++ b/src/xvmc/shader/mc/field_forward_igd.g4b
diff --git a/src/xvmc/frame_backward.g4a b/src/xvmc/shader/mc/frame_backward.g4a
index f669dac5..f669dac5 100644
--- a/src/xvmc/frame_backward.g4a
+++ b/src/xvmc/shader/mc/frame_backward.g4a
diff --git a/src/xvmc/frame_backward.g4b b/src/xvmc/shader/mc/frame_backward.g4b
index 980ad62f..980ad62f 100644
--- a/src/xvmc/frame_backward.g4b
+++ b/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
index 338ae1ee..338ae1ee 100644
--- a/src/xvmc/frame_backward_igd.g4a
+++ b/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
index dbb13205..dbb13205 100644
--- a/src/xvmc/frame_backward_igd.g4b
+++ b/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
index 98729dd2..98729dd2 100644
--- a/src/xvmc/frame_f_b.g4a
+++ b/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
index 760cae14..760cae14 100644
--- a/src/xvmc/frame_f_b.g4b
+++ b/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
index ca7952e8..ca7952e8 100644
--- a/src/xvmc/frame_f_b_igd.g4a
+++ b/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
index f838d7b4..f838d7b4 100644
--- a/src/xvmc/frame_f_b_igd.g4b
+++ b/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
index 925d568e..925d568e 100644
--- a/src/xvmc/frame_forward.g4a
+++ b/src/xvmc/shader/mc/frame_forward.g4a
diff --git a/src/xvmc/frame_forward.g4b b/src/xvmc/shader/mc/frame_forward.g4b
index efbd20c7..efbd20c7 100644
--- a/src/xvmc/frame_forward.g4b
+++ b/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
index f4748074..f4748074 100644
--- a/src/xvmc/frame_forward_igd.g4a
+++ b/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
index 9356180e..9356180e 100644
--- a/src/xvmc/frame_forward_igd.g4b
+++ b/src/xvmc/shader/mc/frame_forward_igd.g4b
diff --git a/src/xvmc/ipicture.g4a b/src/xvmc/shader/mc/ipicture.g4a
index afd5bc3d..afd5bc3d 100644
--- a/src/xvmc/ipicture.g4a
+++ b/src/xvmc/shader/mc/ipicture.g4a
diff --git a/src/xvmc/ipicture.g4b b/src/xvmc/shader/mc/ipicture.g4b
index 10be527f..10be527f 100644
--- a/src/xvmc/ipicture.g4b
+++ b/src/xvmc/shader/mc/ipicture.g4b
diff --git a/src/xvmc/motion_field_uv.g4i b/src/xvmc/shader/mc/motion_field_uv.g4i
index 46401974..46401974 100644
--- a/src/xvmc/motion_field_uv.g4i
+++ b/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
index d4eba848..d4eba848 100644
--- a/src/xvmc/motion_field_uv_igd.g4i
+++ b/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
index 06fa6cb6..06fa6cb6 100644
--- a/src/xvmc/motion_field_y.g4i
+++ b/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
index bd55cb22..bd55cb22 100644
--- a/src/xvmc/motion_field_y_igd.g4i
+++ b/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
index c027c903..c027c903 100644
--- a/src/xvmc/motion_frame_uv.g4i
+++ b/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
index 2e359fd0..2e359fd0 100644
--- a/src/xvmc/motion_frame_uv_igd.g4i
+++ b/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
index f0b212f2..f0b212f2 100644
--- a/src/xvmc/motion_frame_y.g4i
+++ b/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
index 911a8f40..911a8f40 100644
--- a/src/xvmc/motion_frame_y_igd.g4i
+++ b/src/xvmc/shader/mc/motion_frame_y_igd.g4i
diff --git a/src/xvmc/null.g4a b/src/xvmc/shader/mc/null.g4a
index 65698426..65698426 100644
--- a/src/xvmc/null.g4a
+++ b/src/xvmc/shader/mc/null.g4a
diff --git a/src/xvmc/null.g4b b/src/xvmc/shader/mc/null.g4b
index 960fda9a..960fda9a 100644
--- a/src/xvmc/null.g4b
+++ b/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
index 673b8cd3..673b8cd3 100644
--- a/src/xvmc/read_field_x0y0_uv.g4i
+++ b/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
index c03a83d7..c03a83d7 100644
--- a/src/xvmc/read_field_x0y0_uv_igd.g4i
+++ b/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
index 8f4e339c..8f4e339c 100644
--- a/src/xvmc/read_field_x0y0_y.g4i
+++ b/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
index 294cfb4d..294cfb4d 100644
--- a/src/xvmc/read_field_x0y0_y_igd.g4i
+++ b/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
index 1be4fd29..1be4fd29 100644
--- a/src/xvmc/read_field_x0y1_uv.g4i
+++ b/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
index 9e8efa0a..9e8efa0a 100644
--- a/src/xvmc/read_field_x0y1_uv_igd.g4i
+++ b/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
index a15a2218..a15a2218 100644
--- a/src/xvmc/read_field_x0y1_y.g4i
+++ b/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
index e48211b6..e48211b6 100644
--- a/src/xvmc/read_field_x0y1_y_igd.g4i
+++ b/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
index e89a2dc2..e89a2dc2 100644
--- a/src/xvmc/read_field_x1y0_uv.g4i
+++ b/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
index fc56acce..fc56acce 100644
--- a/src/xvmc/read_field_x1y0_uv_igd.g4i
+++ b/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
index a517aaa8..a517aaa8 100644
--- a/src/xvmc/read_field_x1y0_y.g4i
+++ b/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
index 14394cab..14394cab 100644
--- a/src/xvmc/read_field_x1y0_y_igd.g4i
+++ b/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
index 162de9a2..162de9a2 100644
--- a/src/xvmc/read_field_x1y1_uv.g4i
+++ b/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
index 10f48c8b..10f48c8b 100644
--- a/src/xvmc/read_field_x1y1_uv_igd.g4i
+++ b/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
index 7c017012..7c017012 100644
--- a/src/xvmc/read_field_x1y1_y.g4i
+++ b/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
index 39526c89..39526c89 100644
--- a/src/xvmc/read_field_x1y1_y_igd.g4i
+++ b/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
index 43f77a8f..43f77a8f 100644
--- a/src/xvmc/read_frame_x0y0_uv.g4i
+++ b/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
index d522d0ef..d522d0ef 100644
--- a/src/xvmc/read_frame_x0y0_uv_igd.g4i
+++ b/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
index 20f577d6..20f577d6 100644
--- a/src/xvmc/read_frame_x0y0_y.g4i
+++ b/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
index 6191abf1..6191abf1 100644
--- a/src/xvmc/read_frame_x0y0_y_igd.g4i
+++ b/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
index 58bebbc0..58bebbc0 100644
--- a/src/xvmc/read_frame_x0y1_uv.g4i
+++ b/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
index 7240b3f2..7240b3f2 100644
--- a/src/xvmc/read_frame_x0y1_uv_igd.g4i
+++ b/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
index bbc0d787..bbc0d787 100644
--- a/src/xvmc/read_frame_x0y1_y.g4i
+++ b/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
index 106296bb..106296bb 100644
--- a/src/xvmc/read_frame_x0y1_y_igd.g4i
+++ b/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
index bed4abe5..bed4abe5 100644
--- a/src/xvmc/read_frame_x1y0_uv.g4i
+++ b/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
index c63e8ecd..c63e8ecd 100644
--- a/src/xvmc/read_frame_x1y0_uv_igd.g4i
+++ b/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
index 3af3e085..3af3e085 100644
--- a/src/xvmc/read_frame_x1y0_y.g4i
+++ b/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
index 03ee54bd..03ee54bd 100644
--- a/src/xvmc/read_frame_x1y0_y_igd.g4i
+++ b/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
index d124d298..d124d298 100644
--- a/src/xvmc/read_frame_x1y1_uv.g4i
+++ b/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
index 96aada87..96aada87 100644
--- a/src/xvmc/read_frame_x1y1_uv_igd.g4i
+++ b/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
index fa55d865..fa55d865 100644
--- a/src/xvmc/read_frame_x1y1_y.g4i
+++ b/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
index 89adc385..89adc385 100644
--- a/src/xvmc/read_frame_x1y1_y_igd.g4i
+++ b/src/xvmc/shader/mc/read_frame_x1y1_y_igd.g4i