diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-07-22 16:42:00 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-07-22 16:42:00 +0000 |
| commit | 2a746d5cd956a8bc632eacac49f8c4aec3c44db3 (patch) | |
| tree | b7dc069c160c51e744c95421c248e0720d965e3b | |
| parent | 5e5a91178e91469655f6558ecd874d1cbf486478 (diff) | |
| download | xine-lib-2a746d5cd956a8bc632eacac49f8c4aec3c44db3.tar.gz xine-lib-2a746d5cd956a8bc632eacac49f8c4aec3c44db3.tar.bz2 | |
ops missed this one
CVS patchset: 7676
CVS date: 2005/07/22 16:42:00
| -rw-r--r-- | src/post/goom/convolve_fx.c | 16 | ||||
| -rw-r--r-- | src/post/goom/diff_against_release.patch | 35 |
2 files changed, 43 insertions, 8 deletions
diff --git a/src/post/goom/convolve_fx.c b/src/post/goom/convolve_fx.c index 6c205382d..e16a17862 100644 --- a/src/post/goom/convolve_fx.c +++ b/src/post/goom/convolve_fx.c @@ -154,19 +154,19 @@ static void create_output_with_brightness(VisualFX *_this, Pixel *src, Pixel *de #ifdef HAVE_MMX __asm__ __volatile__ ("\n\t pxor %%mm7, %%mm7" /* mm7 = 0 */ - "\n\t movd %[xtex], %%mm2" - "\n\t movd %[ytex], %%mm3" + "\n\t movd %0, %%mm2" + "\n\t movd %1, %%mm3" "\n\t punpckldq %%mm3, %%mm2" /* mm2 = [ ytex | xtex ] */ - "\n\t movd %[c], %%mm4" - "\n\t movd %[s], %%mm6" + "\n\t movd %2, %%mm4" + "\n\t movd %3, %%mm6" "\n\t pxor %%mm5, %%mm5" "\n\t psubd %%mm6, %%mm5" "\n\t punpckldq %%mm5, %%mm4" /* mm4 = [ -s | c ] */ - "\n\t movd %[motif], %%mm6" /* mm6 = motif */ + "\n\t movd %4, %%mm6" /* mm6 = motif */ - ::[xtex]"g"(xtex) ,[ytex]"g"(ytex) - , [c]"g"(c), [s]"g"(s) - , [motif] "g"(&data->conv_motif[0][0])); + ::"g"(xtex) ,"g"(ytex) + , "g"(c), "g"(s) + , "g"(&data->conv_motif[0][0])); for (x=info->screen.width;x--;) { diff --git a/src/post/goom/diff_against_release.patch b/src/post/goom/diff_against_release.patch index 03cacc942..7d45c7978 100644 --- a/src/post/goom/diff_against_release.patch +++ b/src/post/goom/diff_against_release.patch @@ -246,3 +246,38 @@ diff -u -r1.4 convolve_fx.c : "eax","ecx"); i++; +Index: convolve_fx.c +=================================================================== +RCS file: /cvsroot/xine/xine-lib/src/post/goom/convolve_fx.c,v +retrieving revision 1.5 +diff -u -r1.5 convolve_fx.c +--- convolve_fx.c 22 Jul 2005 16:37:44 -0000 1.5 ++++ convolve_fx.c 22 Jul 2005 16:41:19 -0000 +@@ -154,19 +154,19 @@ + #ifdef HAVE_MMX + __asm__ __volatile__ + ("\n\t pxor %%mm7, %%mm7" /* mm7 = 0 */ +- "\n\t movd %[xtex], %%mm2" +- "\n\t movd %[ytex], %%mm3" ++ "\n\t movd %0, %%mm2" ++ "\n\t movd %1, %%mm3" + "\n\t punpckldq %%mm3, %%mm2" /* mm2 = [ ytex | xtex ] */ +- "\n\t movd %[c], %%mm4" +- "\n\t movd %[s], %%mm6" ++ "\n\t movd %2, %%mm4" ++ "\n\t movd %3, %%mm6" + "\n\t pxor %%mm5, %%mm5" + "\n\t psubd %%mm6, %%mm5" + "\n\t punpckldq %%mm5, %%mm4" /* mm4 = [ -s | c ] */ +- "\n\t movd %[motif], %%mm6" /* mm6 = motif */ ++ "\n\t movd %4, %%mm6" /* mm6 = motif */ + +- ::[xtex]"g"(xtex) ,[ytex]"g"(ytex) +- , [c]"g"(c), [s]"g"(s) +- , [motif] "g"(&data->conv_motif[0][0])); ++ ::"g"(xtex) ,"g"(ytex) ++ , "g"(c), "g"(s) ++ , "g"(&data->conv_motif[0][0])); + + for (x=info->screen.width;x--;) + { |