diff options
| author | Keith Packard <keithp@keithp.com> | 2008-03-31 23:50:20 -0700 |
|---|---|---|
| committer | root <root@debian-t61.sh.intel.com> | 2008-04-07 17:17:29 +0800 |
| commit | 09c65c29335ab5192f7398cb2c46c91d3fee2a60 (patch) | |
| tree | 80aaa6cfd56b4665da9c05be371f5442a11daa6a /src/Makefile.am | |
| parent | ff643d5b490095a202963fa799ba1ee657cf07ed (diff) | |
Fix composite with mask using new compositing thread code
Clean up register allocation to never overlap
Always write 4 values for each texture vertex.
(cherry picked from commit a6492661ae07310128eb73c3ef037c42ce7ab184)
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 81d9596a..9b5d653a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -131,18 +131,14 @@ INTEL_G4A = \ packed_yuv_wm.g4a \ exa_sf.g4a \ exa_sf_mask.g4a \ - exa_sf_rotation.g4a \ - exa_wm_maskca.g4a \ - exa_wm_maskca_srcalpha.g4a \ - exa_wm_masknoca.g4a \ - exa_wm_nomask.g4a \ - exa_wm_rotation.g4a \ exa_wm_src_affine.g4a \ exa_wm_src_projective.g4a \ - exa_wm_src_sample.g4a \ + exa_wm_src_sample_argb.g4a \ + exa_wm_src_sample_a.g4a \ exa_wm_mask_affine.g4a \ exa_wm_mask_projective.g4a \ - exa_wm_mask_sample.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 \ @@ -153,29 +149,21 @@ 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_mask.g4b \ + packed_yuv_wm.g4b \ exa_sf.g4b \ - exa_sf_rotation.g4b \ - exa_wm_maskca.g4b \ - exa_wm_maskca_srcalpha.g4b \ - exa_wm_masknoca.g4b \ - exa_wm_nomask.g4b \ - exa_wm_rotation.g4b \ - exa_wm_maskca.g4b \ - exa_wm_maskca_srcalpha.g4b \ - exa_wm_masknoca.g4b \ - exa_wm_nomask.g4b \ - exa_wm_rotation.g4b \ + exa_sf_mask.g4b \ exa_wm_src_affine.g4b \ exa_wm_src_projective.g4b \ - exa_wm_src_sample.g4b \ + exa_wm_src_sample_argb.g4b \ + exa_wm_src_sample_a.g4b \ exa_wm_mask_affine.g4b \ exa_wm_mask_projective.g4b \ - exa_wm_mask_sample.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 \ @@ -194,8 +182,11 @@ if HAVE_GEN4ASM SUFFIXES = .g4a .g4b .g4a.g4b: - m4 -s $*.g4a > $*.g4m - intel-gen4asm -o $@ $*.g4m && rm $*.g4m + m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m + +$(INTEL_G4B): $(INTEL_G4I) + +BUILT_SOURCES= $(INTEL_G4B) endif |