Move shader programs under its own subdirectory

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>

45 files changed, 69 insertions, 66 deletions

diff --git a/configure.ac b/configure.ac
index 0864d7c5..397336ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,4 +195,5 @@ AC_OUTPUT([
 	src/sil164/Makefile
 	src/tfp410/Makefile
 	man/Makefile
+	src/render_program/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6496dec5..ea52fcb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@
 #  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.
 
-SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 reg_dumper
+SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 reg_dumper render_program
 
 # this is obnoxious:
 # -module lets us name the module exactly how we want
@@ -27,7 +27,7 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 reg_dumper
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
 AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa
+	@PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa -I$(top_srcdir)/src/render_program
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
@@ -110,75 +110,11 @@ intel_drv_la_SOURCES = \
 	 i965_render.c \
 	 drmmode_display.c
 
-INTEL_G4A =				\
-	packed_yuv_sf.g4a		\
-	packed_yuv_wm.g4a		\
-	exa_sf.g4a 			\
-	exa_sf_mask.g4a 		\
-	exa_wm_src_affine.g4a 		\
-	exa_wm_src_projective.g4a 	\
-	exa_wm_src_sample_argb.g4a 	\
-	exa_wm_src_sample_a.g4a 	\
-	exa_wm_src_sample_planar.g4a 	\
-	exa_wm_mask_affine.g4a 		\
-	exa_wm_mask_projective.g4a 	\
-	exa_wm_mask_sample_argb.g4a 	\
-	exa_wm_mask_sample_a.g4a 	\
-	exa_wm_noca.g4a			\
-	exa_wm_ca.g4a			\
-	exa_wm_ca_srcalpha.g4a		\
-	exa_wm_write.g4a 		\
-	exa_wm_yuv_rgb.g4a		\
-	exa_wm_xy.g4a
-
-INTEL_G4I =				\
-	exa_wm.g4i			\
-	exa_wm_affine.g4i		\
-	exa_wm_projective.g4i
-
-INTEL_G4B = 				\
-	packed_yuv_sf.g4b		\
-	packed_yuv_wm.g4b		\
-	exa_sf.g4b 			\
-	exa_sf_mask.g4b 		\
-	exa_wm_src_affine.g4b 		\
-	exa_wm_src_projective.g4b 	\
-	exa_wm_src_sample_argb.g4b 	\
-	exa_wm_src_sample_a.g4b 	\
-	exa_wm_src_sample_planar.g4b 	\
-	exa_wm_mask_affine.g4b 		\
-	exa_wm_mask_projective.g4b 	\
-	exa_wm_mask_sample_argb.g4b 	\
-	exa_wm_mask_sample_a.g4b 	\
-	exa_wm_noca.g4b			\
-	exa_wm_ca.g4b			\
-	exa_wm_ca_srcalpha.g4b		\
-	exa_wm_write.g4b 		\
-	exa_wm_yuv_rgb.g4b		\
-	exa_wm_xy.g4b
-
 EXTRA_DIST = 		\
 	$(XMODE_SRCS)	\
-	$(INTEL_G4A)	\
-	$(INTEL_G4I)	\
-	$(INTEL_G4B)	\
 	$(INTEL_DRI_SRCS) \
 	$(INTEL_XVMC_SRCS)
 
-if HAVE_GEN4ASM
-
-SUFFIXES = .g4a .g4b
-.g4a.g4b:
-	m4 -I$(srcdir) -s $< > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m
-
-$(INTEL_G4B): $(INTEL_G4I)
-
-BUILT_SOURCES= $(INTEL_G4B)
-
-clean-local:
-	-rm -f $(INTEL_G4B)
-endif
-
 if DRI
 intel_drv_la_SOURCES += \
 	$(INTEL_DRI_SRCS)
diff --git a/src/render_program/Makefile.am b/src/render_program/Makefile.am
new file mode 100644
index 00000000..820303fc
--- /dev/null
+++ b/src/render_program/Makefile.am
@@ -0,0 +1,66 @@
+INTEL_G4A =				\
+	packed_yuv_sf.g4a		\
+	packed_yuv_wm.g4a		\
+	exa_sf.g4a 			\
+	exa_sf_mask.g4a 		\
+	exa_wm_src_affine.g4a 		\
+	exa_wm_src_projective.g4a 	\
+	exa_wm_src_sample_argb.g4a 	\
+	exa_wm_src_sample_a.g4a 	\
+	exa_wm_src_sample_planar.g4a 	\
+	exa_wm_mask_affine.g4a 		\
+	exa_wm_mask_projective.g4a 	\
+	exa_wm_mask_sample_argb.g4a 	\
+	exa_wm_mask_sample_a.g4a 	\
+	exa_wm_noca.g4a			\
+	exa_wm_ca.g4a			\
+	exa_wm_ca_srcalpha.g4a		\
+	exa_wm_write.g4a 		\
+	exa_wm_yuv_rgb.g4a		\
+	exa_wm_xy.g4a
+
+INTEL_G4I =				\
+	exa_wm.g4i			\
+	exa_wm_affine.g4i		\
+	exa_wm_projective.g4i
+
+INTEL_G4B = 				\
+	packed_yuv_sf.g4b		\
+	packed_yuv_wm.g4b		\
+	exa_sf.g4b 			\
+	exa_sf_mask.g4b 		\
+	exa_wm_src_affine.g4b 		\
+	exa_wm_src_projective.g4b 	\
+	exa_wm_src_sample_argb.g4b 	\
+	exa_wm_src_sample_a.g4b 	\
+	exa_wm_src_sample_planar.g4b 	\
+	exa_wm_mask_affine.g4b 		\
+	exa_wm_mask_projective.g4b 	\
+	exa_wm_mask_sample_argb.g4b 	\
+	exa_wm_mask_sample_a.g4b 	\
+	exa_wm_noca.g4b			\
+	exa_wm_ca.g4b			\
+	exa_wm_ca_srcalpha.g4b		\
+	exa_wm_write.g4b 		\
+	exa_wm_yuv_rgb.g4b		\
+	exa_wm_xy.g4b
+
+
+EXTRA_DIST = 		\
+	$(INTEL_G4A)	\
+	$(INTEL_G4I)	\
+	$(INTEL_G4B)
+
+if HAVE_GEN4ASM
+
+SUFFIXES = .g4a .g4b
+.g4a.g4b:
+	m4 -I$(srcdir) -s $< > $*.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/exa_sf.g4a b/src/render_program/exa_sf.g4a
index 3e660ac2..3e660ac2 100644
--- a/src/exa_sf.g4a
+++ b/src/render_program/exa_sf.g4a
diff --git a/src/exa_sf.g4b b/src/render_program/exa_sf.g4b
index 223c9c9a..223c9c9a 100644
--- a/src/exa_sf.g4b
+++ b/src/render_program/exa_sf.g4b
diff --git a/src/exa_sf_mask.g4a b/src/render_program/exa_sf_mask.g4a
index 5078d014..5078d014 100644
--- a/src/exa_sf_mask.g4a
+++ b/src/render_program/exa_sf_mask.g4a
diff --git a/src/exa_sf_mask.g4b b/src/render_program/exa_sf_mask.g4b
index be0a77b0..be0a77b0 100644
--- a/src/exa_sf_mask.g4b
+++ b/src/render_program/exa_sf_mask.g4b
diff --git a/src/exa_wm.g4i b/src/render_program/exa_wm.g4i
index 5d3d45b1..5d3d45b1 100644
--- a/src/exa_wm.g4i
+++ b/src/render_program/exa_wm.g4i
diff --git a/src/exa_wm_affine.g4i b/src/render_program/exa_wm_affine.g4i
index e72656b6..e72656b6 100644
--- a/src/exa_wm_affine.g4i
+++ b/src/render_program/exa_wm_affine.g4i
diff --git a/src/exa_wm_ca.g4a b/src/render_program/exa_wm_ca.g4a
index 5d982b38..5d982b38 100644
--- a/src/exa_wm_ca.g4a
+++ b/src/render_program/exa_wm_ca.g4a
diff --git a/src/exa_wm_ca.g4b b/src/render_program/exa_wm_ca.g4b
index 372e8b26..372e8b26 100644
--- a/src/exa_wm_ca.g4b
+++ b/src/render_program/exa_wm_ca.g4b
diff --git a/src/exa_wm_ca_srcalpha.g4a b/src/render_program/exa_wm_ca_srcalpha.g4a
index d1f847fd..d1f847fd 100644
--- a/src/exa_wm_ca_srcalpha.g4a
+++ b/src/render_program/exa_wm_ca_srcalpha.g4a
diff --git a/src/exa_wm_ca_srcalpha.g4b b/src/render_program/exa_wm_ca_srcalpha.g4b
index 963d6760..963d6760 100644
--- a/src/exa_wm_ca_srcalpha.g4b
+++ b/src/render_program/exa_wm_ca_srcalpha.g4b
diff --git a/src/exa_wm_mask_affine.g4a b/src/render_program/exa_wm_mask_affine.g4a
index 9c52d2f9..9c52d2f9 100644
--- a/src/exa_wm_mask_affine.g4a
+++ b/src/render_program/exa_wm_mask_affine.g4a
diff --git a/src/exa_wm_mask_affine.g4b b/src/render_program/exa_wm_mask_affine.g4b
index 14a54517..14a54517 100644
--- a/src/exa_wm_mask_affine.g4b
+++ b/src/render_program/exa_wm_mask_affine.g4b
diff --git a/src/exa_wm_mask_projective.g4a b/src/render_program/exa_wm_mask_projective.g4a
index 9acaaced..9acaaced 100644
--- a/src/exa_wm_mask_projective.g4a
+++ b/src/render_program/exa_wm_mask_projective.g4a
diff --git a/src/exa_wm_mask_projective.g4b b/src/render_program/exa_wm_mask_projective.g4b
index 78cb9aef..78cb9aef 100644
--- a/src/exa_wm_mask_projective.g4b
+++ b/src/render_program/exa_wm_mask_projective.g4b
diff --git a/src/exa_wm_mask_sample_a.g4a b/src/render_program/exa_wm_mask_sample_a.g4a
index bbb19d7a..bbb19d7a 100644
--- a/src/exa_wm_mask_sample_a.g4a
+++ b/src/render_program/exa_wm_mask_sample_a.g4a
diff --git a/src/exa_wm_mask_sample_a.g4b b/src/render_program/exa_wm_mask_sample_a.g4b
index 018bd36a..018bd36a 100644
--- a/src/exa_wm_mask_sample_a.g4b
+++ b/src/render_program/exa_wm_mask_sample_a.g4b
diff --git a/src/exa_wm_mask_sample_argb.g4a b/src/render_program/exa_wm_mask_sample_argb.g4a
index def4cfe4..def4cfe4 100644
--- a/src/exa_wm_mask_sample_argb.g4a
+++ b/src/render_program/exa_wm_mask_sample_argb.g4a
diff --git a/src/exa_wm_mask_sample_argb.g4b b/src/render_program/exa_wm_mask_sample_argb.g4b
index b159cbaa..b159cbaa 100644
--- a/src/exa_wm_mask_sample_argb.g4b
+++ b/src/render_program/exa_wm_mask_sample_argb.g4b
diff --git a/src/exa_wm_noca.g4a b/src/render_program/exa_wm_noca.g4a
index d0d60faa..d0d60faa 100644
--- a/src/exa_wm_noca.g4a
+++ b/src/render_program/exa_wm_noca.g4a
diff --git a/src/exa_wm_noca.g4b b/src/render_program/exa_wm_noca.g4b
index 15063341..15063341 100644
--- a/src/exa_wm_noca.g4b
+++ b/src/render_program/exa_wm_noca.g4b
diff --git a/src/exa_wm_nomask.g4a b/src/render_program/exa_wm_nomask.g4a
index eb535fe3..eb535fe3 100644
--- a/src/exa_wm_nomask.g4a
+++ b/src/render_program/exa_wm_nomask.g4a
diff --git a/src/exa_wm_projective.g4i b/src/render_program/exa_wm_projective.g4i
index 7e2e0a82..7e2e0a82 100644
--- a/src/exa_wm_projective.g4i
+++ b/src/render_program/exa_wm_projective.g4i
diff --git a/src/exa_wm_src_affine.g4a b/src/render_program/exa_wm_src_affine.g4a
index 3194b5a6..3194b5a6 100644
--- a/src/exa_wm_src_affine.g4a
+++ b/src/render_program/exa_wm_src_affine.g4a
diff --git a/src/exa_wm_src_affine.g4b b/src/render_program/exa_wm_src_affine.g4b
index d30da873..d30da873 100644
--- a/src/exa_wm_src_affine.g4b
+++ b/src/render_program/exa_wm_src_affine.g4b
diff --git a/src/exa_wm_src_projective.g4a b/src/render_program/exa_wm_src_projective.g4a
index 16c9cd56..16c9cd56 100644
--- a/src/exa_wm_src_projective.g4a
+++ b/src/render_program/exa_wm_src_projective.g4a
diff --git a/src/exa_wm_src_projective.g4b b/src/render_program/exa_wm_src_projective.g4b
index 198bab3e..198bab3e 100644
--- a/src/exa_wm_src_projective.g4b
+++ b/src/render_program/exa_wm_src_projective.g4b
diff --git a/src/exa_wm_src_sample_a.g4a b/src/render_program/exa_wm_src_sample_a.g4a
index 552aaeeb..552aaeeb 100644
--- a/src/exa_wm_src_sample_a.g4a
+++ b/src/render_program/exa_wm_src_sample_a.g4a
diff --git a/src/exa_wm_src_sample_a.g4b b/src/render_program/exa_wm_src_sample_a.g4b
index ce8650a0..ce8650a0 100644
--- a/src/exa_wm_src_sample_a.g4b
+++ b/src/render_program/exa_wm_src_sample_a.g4b
diff --git a/src/exa_wm_src_sample_argb.g4a b/src/render_program/exa_wm_src_sample_argb.g4a
index c20f53f2..c20f53f2 100644
--- a/src/exa_wm_src_sample_argb.g4a
+++ b/src/render_program/exa_wm_src_sample_argb.g4a
diff --git a/src/exa_wm_src_sample_argb.g4b b/src/render_program/exa_wm_src_sample_argb.g4b
index c5b92740..c5b92740 100644
--- a/src/exa_wm_src_sample_argb.g4b
+++ b/src/render_program/exa_wm_src_sample_argb.g4b
diff --git a/src/exa_wm_src_sample_planar.g4a b/src/render_program/exa_wm_src_sample_planar.g4a
index ca77b484..ca77b484 100644
--- a/src/exa_wm_src_sample_planar.g4a
+++ b/src/render_program/exa_wm_src_sample_planar.g4a
diff --git a/src/exa_wm_src_sample_planar.g4b b/src/render_program/exa_wm_src_sample_planar.g4b
index 77a5c234..77a5c234 100644
--- a/src/exa_wm_src_sample_planar.g4b
+++ b/src/render_program/exa_wm_src_sample_planar.g4b
diff --git a/src/exa_wm_write.g4a b/src/render_program/exa_wm_write.g4a
index faee80b3..faee80b3 100644
--- a/src/exa_wm_write.g4a
+++ b/src/render_program/exa_wm_write.g4a
diff --git a/src/exa_wm_write.g4b b/src/render_program/exa_wm_write.g4b
index 92e7b248..92e7b248 100644
--- a/src/exa_wm_write.g4b
+++ b/src/render_program/exa_wm_write.g4b
diff --git a/src/exa_wm_xy.g4a b/src/render_program/exa_wm_xy.g4a
index e99f5ac1..e99f5ac1 100644
--- a/src/exa_wm_xy.g4a
+++ b/src/render_program/exa_wm_xy.g4a
diff --git a/src/exa_wm_xy.g4b b/src/render_program/exa_wm_xy.g4b
index 327fc29c..327fc29c 100644
--- a/src/exa_wm_xy.g4b
+++ b/src/render_program/exa_wm_xy.g4b
diff --git a/src/exa_wm_yuv_rgb.g4a b/src/render_program/exa_wm_yuv_rgb.g4a
index 4fb2576a..4fb2576a 100644
--- a/src/exa_wm_yuv_rgb.g4a
+++ b/src/render_program/exa_wm_yuv_rgb.g4a
diff --git a/src/exa_wm_yuv_rgb.g4b b/src/render_program/exa_wm_yuv_rgb.g4b
index 01f6e2b2..01f6e2b2 100644
--- a/src/exa_wm_yuv_rgb.g4b
+++ b/src/render_program/exa_wm_yuv_rgb.g4b
diff --git a/src/packed_yuv_sf.g4a b/src/render_program/packed_yuv_sf.g4a
index 5a023992..5a023992 100644
--- a/src/packed_yuv_sf.g4a
+++ b/src/render_program/packed_yuv_sf.g4a
diff --git a/src/packed_yuv_sf.g4b b/src/render_program/packed_yuv_sf.g4b
index 830d1760..830d1760 100644
--- a/src/packed_yuv_sf.g4b
+++ b/src/render_program/packed_yuv_sf.g4b
diff --git a/src/packed_yuv_wm.g4a b/src/render_program/packed_yuv_wm.g4a
index 2be52b5f..2be52b5f 100644
--- a/src/packed_yuv_wm.g4a
+++ b/src/render_program/packed_yuv_wm.g4a
diff --git a/src/packed_yuv_wm.g4b b/src/render_program/packed_yuv_wm.g4b
index f2e650a3..f2e650a3 100644
--- a/src/packed_yuv_wm.g4b
+++ b/src/render_program/packed_yuv_wm.g4b