From 488acc4595bb7f40130afcb8bcb05656ff3ae82c Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Thu, 25 Jun 2009 14:05:40 +0800 Subject: [PATCH] Move shader programs under its own subdirectory Signed-off-by: Zhenyu Wang --- configure.ac | 1 + src/Makefile.am | 68 +------------------ src/render_program/Makefile.am | 66 ++++++++++++++++++ src/{ => render_program}/exa_sf.g4a | 0 src/{ => render_program}/exa_sf.g4b | 0 src/{ => render_program}/exa_sf_mask.g4a | 0 src/{ => render_program}/exa_sf_mask.g4b | 0 src/{ => render_program}/exa_wm.g4i | 0 src/{ => render_program}/exa_wm_affine.g4i | 0 src/{ => render_program}/exa_wm_ca.g4a | 0 src/{ => render_program}/exa_wm_ca.g4b | 0 .../exa_wm_ca_srcalpha.g4a | 0 .../exa_wm_ca_srcalpha.g4b | 0 .../exa_wm_mask_affine.g4a | 0 .../exa_wm_mask_affine.g4b | 0 .../exa_wm_mask_projective.g4a | 0 .../exa_wm_mask_projective.g4b | 0 .../exa_wm_mask_sample_a.g4a | 0 .../exa_wm_mask_sample_a.g4b | 0 .../exa_wm_mask_sample_argb.g4a | 0 .../exa_wm_mask_sample_argb.g4b | 0 src/{ => render_program}/exa_wm_noca.g4a | 0 src/{ => render_program}/exa_wm_noca.g4b | 0 src/{ => render_program}/exa_wm_nomask.g4a | 0 .../exa_wm_projective.g4i | 0 .../exa_wm_src_affine.g4a | 0 .../exa_wm_src_affine.g4b | 0 .../exa_wm_src_projective.g4a | 0 .../exa_wm_src_projective.g4b | 0 .../exa_wm_src_sample_a.g4a | 0 .../exa_wm_src_sample_a.g4b | 0 .../exa_wm_src_sample_argb.g4a | 0 .../exa_wm_src_sample_argb.g4b | 0 .../exa_wm_src_sample_planar.g4a | 0 .../exa_wm_src_sample_planar.g4b | 0 src/{ => render_program}/exa_wm_write.g4a | 0 src/{ => render_program}/exa_wm_write.g4b | 0 src/{ => render_program}/exa_wm_xy.g4a | 0 src/{ => render_program}/exa_wm_xy.g4b | 0 src/{ => render_program}/exa_wm_yuv_rgb.g4a | 0 src/{ => render_program}/exa_wm_yuv_rgb.g4b | 0 src/{ => render_program}/packed_yuv_sf.g4a | 0 src/{ => render_program}/packed_yuv_sf.g4b | 0 src/{ => render_program}/packed_yuv_wm.g4a | 0 src/{ => render_program}/packed_yuv_wm.g4b | 0 45 files changed, 69 insertions(+), 66 deletions(-) create mode 100644 src/render_program/Makefile.am rename src/{ => render_program}/exa_sf.g4a (100%) rename src/{ => render_program}/exa_sf.g4b (100%) rename src/{ => render_program}/exa_sf_mask.g4a (100%) rename src/{ => render_program}/exa_sf_mask.g4b (100%) rename src/{ => render_program}/exa_wm.g4i (100%) rename src/{ => render_program}/exa_wm_affine.g4i (100%) rename src/{ => render_program}/exa_wm_ca.g4a (100%) rename src/{ => render_program}/exa_wm_ca.g4b (100%) rename src/{ => render_program}/exa_wm_ca_srcalpha.g4a (100%) rename src/{ => render_program}/exa_wm_ca_srcalpha.g4b (100%) rename src/{ => render_program}/exa_wm_mask_affine.g4a (100%) rename src/{ => render_program}/exa_wm_mask_affine.g4b (100%) rename src/{ => render_program}/exa_wm_mask_projective.g4a (100%) rename src/{ => render_program}/exa_wm_mask_projective.g4b (100%) rename src/{ => render_program}/exa_wm_mask_sample_a.g4a (100%) rename src/{ => render_program}/exa_wm_mask_sample_a.g4b (100%) rename src/{ => render_program}/exa_wm_mask_sample_argb.g4a (100%) rename src/{ => render_program}/exa_wm_mask_sample_argb.g4b (100%) rename src/{ => render_program}/exa_wm_noca.g4a (100%) rename src/{ => render_program}/exa_wm_noca.g4b (100%) rename src/{ => render_program}/exa_wm_nomask.g4a (100%) rename src/{ => render_program}/exa_wm_projective.g4i (100%) rename src/{ => render_program}/exa_wm_src_affine.g4a (100%) rename src/{ => render_program}/exa_wm_src_affine.g4b (100%) rename src/{ => render_program}/exa_wm_src_projective.g4a (100%) rename src/{ => render_program}/exa_wm_src_projective.g4b (100%) rename src/{ => render_program}/exa_wm_src_sample_a.g4a (100%) rename src/{ => render_program}/exa_wm_src_sample_a.g4b (100%) rename src/{ => render_program}/exa_wm_src_sample_argb.g4a (100%) rename src/{ => render_program}/exa_wm_src_sample_argb.g4b (100%) rename src/{ => render_program}/exa_wm_src_sample_planar.g4a (100%) rename src/{ => render_program}/exa_wm_src_sample_planar.g4b (100%) rename src/{ => render_program}/exa_wm_write.g4a (100%) rename src/{ => render_program}/exa_wm_write.g4b (100%) rename src/{ => render_program}/exa_wm_xy.g4a (100%) rename src/{ => render_program}/exa_wm_xy.g4b (100%) rename src/{ => render_program}/exa_wm_yuv_rgb.g4a (100%) rename src/{ => render_program}/exa_wm_yuv_rgb.g4b (100%) rename src/{ => render_program}/packed_yuv_sf.g4a (100%) rename src/{ => render_program}/packed_yuv_sf.g4b (100%) rename src/{ => render_program}/packed_yuv_wm.g4a (100%) rename src/{ => render_program}/packed_yuv_wm.g4b (100%) 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 similarity index 100% rename from src/exa_sf.g4a rename to src/render_program/exa_sf.g4a diff --git a/src/exa_sf.g4b b/src/render_program/exa_sf.g4b similarity index 100% rename from src/exa_sf.g4b rename to src/render_program/exa_sf.g4b diff --git a/src/exa_sf_mask.g4a b/src/render_program/exa_sf_mask.g4a similarity index 100% rename from src/exa_sf_mask.g4a rename to src/render_program/exa_sf_mask.g4a diff --git a/src/exa_sf_mask.g4b b/src/render_program/exa_sf_mask.g4b similarity index 100% rename from src/exa_sf_mask.g4b rename to src/render_program/exa_sf_mask.g4b diff --git a/src/exa_wm.g4i b/src/render_program/exa_wm.g4i similarity index 100% rename from src/exa_wm.g4i rename to src/render_program/exa_wm.g4i diff --git a/src/exa_wm_affine.g4i b/src/render_program/exa_wm_affine.g4i similarity index 100% rename from src/exa_wm_affine.g4i rename to src/render_program/exa_wm_affine.g4i diff --git a/src/exa_wm_ca.g4a b/src/render_program/exa_wm_ca.g4a similarity index 100% rename from src/exa_wm_ca.g4a rename to src/render_program/exa_wm_ca.g4a diff --git a/src/exa_wm_ca.g4b b/src/render_program/exa_wm_ca.g4b similarity index 100% rename from src/exa_wm_ca.g4b rename to 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 similarity index 100% rename from src/exa_wm_ca_srcalpha.g4a rename to 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 similarity index 100% rename from src/exa_wm_ca_srcalpha.g4b rename to 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 similarity index 100% rename from src/exa_wm_mask_affine.g4a rename to 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 similarity index 100% rename from src/exa_wm_mask_affine.g4b rename to 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 similarity index 100% rename from src/exa_wm_mask_projective.g4a rename to 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 similarity index 100% rename from src/exa_wm_mask_projective.g4b rename to 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 similarity index 100% rename from src/exa_wm_mask_sample_a.g4a rename to 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 similarity index 100% rename from src/exa_wm_mask_sample_a.g4b rename to 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 similarity index 100% rename from src/exa_wm_mask_sample_argb.g4a rename to 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 similarity index 100% rename from src/exa_wm_mask_sample_argb.g4b rename to 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 similarity index 100% rename from src/exa_wm_noca.g4a rename to src/render_program/exa_wm_noca.g4a diff --git a/src/exa_wm_noca.g4b b/src/render_program/exa_wm_noca.g4b similarity index 100% rename from src/exa_wm_noca.g4b rename to src/render_program/exa_wm_noca.g4b diff --git a/src/exa_wm_nomask.g4a b/src/render_program/exa_wm_nomask.g4a similarity index 100% rename from src/exa_wm_nomask.g4a rename to src/render_program/exa_wm_nomask.g4a diff --git a/src/exa_wm_projective.g4i b/src/render_program/exa_wm_projective.g4i similarity index 100% rename from src/exa_wm_projective.g4i rename to 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 similarity index 100% rename from src/exa_wm_src_affine.g4a rename to 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 similarity index 100% rename from src/exa_wm_src_affine.g4b rename to 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 similarity index 100% rename from src/exa_wm_src_projective.g4a rename to 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 similarity index 100% rename from src/exa_wm_src_projective.g4b rename to 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 similarity index 100% rename from src/exa_wm_src_sample_a.g4a rename to 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 similarity index 100% rename from src/exa_wm_src_sample_a.g4b rename to 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 similarity index 100% rename from src/exa_wm_src_sample_argb.g4a rename to 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 similarity index 100% rename from src/exa_wm_src_sample_argb.g4b rename to 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 similarity index 100% rename from src/exa_wm_src_sample_planar.g4a rename to 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 similarity index 100% rename from src/exa_wm_src_sample_planar.g4b rename to 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 similarity index 100% rename from src/exa_wm_write.g4a rename to src/render_program/exa_wm_write.g4a diff --git a/src/exa_wm_write.g4b b/src/render_program/exa_wm_write.g4b similarity index 100% rename from src/exa_wm_write.g4b rename to src/render_program/exa_wm_write.g4b diff --git a/src/exa_wm_xy.g4a b/src/render_program/exa_wm_xy.g4a similarity index 100% rename from src/exa_wm_xy.g4a rename to src/render_program/exa_wm_xy.g4a diff --git a/src/exa_wm_xy.g4b b/src/render_program/exa_wm_xy.g4b similarity index 100% rename from src/exa_wm_xy.g4b rename to 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 similarity index 100% rename from src/exa_wm_yuv_rgb.g4a rename to 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 similarity index 100% rename from src/exa_wm_yuv_rgb.g4b rename to src/render_program/exa_wm_yuv_rgb.g4b diff --git a/src/packed_yuv_sf.g4a b/src/render_program/packed_yuv_sf.g4a similarity index 100% rename from src/packed_yuv_sf.g4a rename to src/render_program/packed_yuv_sf.g4a diff --git a/src/packed_yuv_sf.g4b b/src/render_program/packed_yuv_sf.g4b similarity index 100% rename from src/packed_yuv_sf.g4b rename to src/render_program/packed_yuv_sf.g4b diff --git a/src/packed_yuv_wm.g4a b/src/render_program/packed_yuv_wm.g4a similarity index 100% rename from src/packed_yuv_wm.g4a rename to src/render_program/packed_yuv_wm.g4a diff --git a/src/packed_yuv_wm.g4b b/src/render_program/packed_yuv_wm.g4b similarity index 100% rename from src/packed_yuv_wm.g4b rename to src/render_program/packed_yuv_wm.g4b