[Liboil-commit] 4 commits - autogen.sh liboil/liboilfuncs-04.h liboil/liboilfuncs-doc.h liboil/liboilfuncs.h liboil/liboiltrampolines.c m4/as-gcc-inline-assembly.m4 testsuite/moo.c
David Schleef
ds at kemper.freedesktop.org
Mon Feb 18 18:10:38 PST 2008
autogen.sh | 2 +-
liboil/liboilfuncs-04.h | 4 ++--
liboil/liboilfuncs-doc.h | 4 ++--
liboil/liboilfuncs.h | 4 ++--
liboil/liboiltrampolines.c | 8 ++++----
m4/as-gcc-inline-assembly.m4 | 3 +++
testsuite/moo.c | 1 +
7 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit f9c65c2f6f8324251a9364e46ae02fdd94d78858
Author: David Schleef <ds at ginger.bigkitten.com>
Date: Mon Feb 18 18:12:32 2008 -0800
Run update again
diff --git a/liboil/liboilfuncs-04.h b/liboil/liboilfuncs-04.h
index 7b35de1..272d33f 100644
--- a/liboil/liboilfuncs-04.h
+++ b/liboil/liboilfuncs-04.h
@@ -52,8 +52,8 @@ void oil_addc_rshift_s16 (int16_t * d1, const int16_t * s1, const int16_t * s2_2
void oil_addc_s16 (int16_t * d1, const int16_t * s1, const int16_t * s2_1, int n);
void oil_argb_paint_u8 (uint8_t * i_4xn, const uint8_t * s1_4, const uint8_t * s2_n, int n);
void oil_average2_u8 (uint8_t * d, int dstr, const uint8_t * s1, int sstr1, const uint8_t * s2, int sstr2, int n);
-void oil_avg2_12xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
-void oil_avg2_16xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
+void oil_avg2_12xn_u8 (uint8_t * d_12xn, int ds1, const uint8_t * s1_12xn, int ss1, const uint8_t * s2_12xn, int ss2, int n);
+void oil_avg2_16xn_u8 (uint8_t * d_16xn, int ds1, const uint8_t * s1_16xn, int ss1, const uint8_t * s2_16xn, int ss2, int n);
void oil_avg2_8xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
void oil_ayuv2argb_u8 (uint8_t * d_4xn, const uint8_t * s_4xn, int n);
void oil_ayuv2uyvy (uint32_t * d_n, const uint32_t * s_n, int n);
diff --git a/liboil/liboilfuncs-doc.h b/liboil/liboilfuncs-doc.h
index 7237cdb..50a3e2f 100644
--- a/liboil/liboilfuncs-doc.h
+++ b/liboil/liboilfuncs-doc.h
@@ -16,8 +16,8 @@ void oil_addc_rshift_s16 (int16_t * d1, const int16_t * s1, const int16_t * s2_2
void oil_addc_s16 (int16_t * d1, const int16_t * s1, const int16_t * s2_1, int n);
void oil_argb_paint_u8 (uint8_t * i_4xn, const uint8_t * s1_4, const uint8_t * s2_n, int n);
void oil_average2_u8 (uint8_t * d, int dstr, const uint8_t * s1, int sstr1, const uint8_t * s2, int sstr2, int n);
-void oil_avg2_12xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
-void oil_avg2_16xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
+void oil_avg2_12xn_u8 (uint8_t * d_12xn, int ds1, const uint8_t * s1_12xn, int ss1, const uint8_t * s2_12xn, int ss2, int n);
+void oil_avg2_16xn_u8 (uint8_t * d_16xn, int ds1, const uint8_t * s1_16xn, int ss1, const uint8_t * s2_16xn, int ss2, int n);
void oil_avg2_8xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
void oil_ayuv2argb_u8 (uint8_t * d_4xn, const uint8_t * s_4xn, int n);
void oil_ayuv2uyvy (uint32_t * d_n, const uint32_t * s_n, int n);
diff --git a/liboil/liboilfuncs.h b/liboil/liboilfuncs.h
index 9536ec4..b854a78 100644
--- a/liboil/liboilfuncs.h
+++ b/liboil/liboilfuncs.h
@@ -85,10 +85,10 @@ extern OilFunctionClass *oil_function_class_ptr_average2_u8;
typedef void (*_oil_type_average2_u8)(uint8_t * d, int dstr, const uint8_t * s1, int sstr1, const uint8_t * s2, int sstr2, int n);
#define oil_average2_u8 ((_oil_type_average2_u8)(*(void **)oil_function_class_ptr_average2_u8))
extern OilFunctionClass *oil_function_class_ptr_avg2_12xn_u8;
-typedef void (*_oil_type_avg2_12xn_u8)(uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
+typedef void (*_oil_type_avg2_12xn_u8)(uint8_t * d_12xn, int ds1, const uint8_t * s1_12xn, int ss1, const uint8_t * s2_12xn, int ss2, int n);
#define oil_avg2_12xn_u8 ((_oil_type_avg2_12xn_u8)(*(void **)oil_function_class_ptr_avg2_12xn_u8))
extern OilFunctionClass *oil_function_class_ptr_avg2_16xn_u8;
-typedef void (*_oil_type_avg2_16xn_u8)(uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
+typedef void (*_oil_type_avg2_16xn_u8)(uint8_t * d_16xn, int ds1, const uint8_t * s1_16xn, int ss1, const uint8_t * s2_16xn, int ss2, int n);
#define oil_avg2_16xn_u8 ((_oil_type_avg2_16xn_u8)(*(void **)oil_function_class_ptr_avg2_16xn_u8))
extern OilFunctionClass *oil_function_class_ptr_avg2_8xn_u8;
typedef void (*_oil_type_avg2_8xn_u8)(uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n);
diff --git a/liboil/liboiltrampolines.c b/liboil/liboiltrampolines.c
index bc1b8bf..fa41a2e 100644
--- a/liboil/liboiltrampolines.c
+++ b/liboil/liboiltrampolines.c
@@ -193,22 +193,22 @@ oil_average2_u8 (uint8_t * d, int dstr, const uint8_t * s1, int sstr1, const uin
#undef oil_avg2_12xn_u8
void
-oil_avg2_12xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n)
+oil_avg2_12xn_u8 (uint8_t * d_12xn, int ds1, const uint8_t * s1_12xn, int ss1, const uint8_t * s2_12xn, int ss2, int n)
{
if (_oil_function_class_avg2_12xn_u8.func == NULL) {
oil_class_optimize (&_oil_function_class_avg2_12xn_u8);
}
- ((void (*)(uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n))(_oil_function_class_avg2_12xn_u8.func))(d_8xn, ds1, s1_8xn, ss1, s2_8xn, ss2, n);
+ ((void (*)(uint8_t * d_12xn, int ds1, const uint8_t * s1_12xn, int ss1, const uint8_t * s2_12xn, int ss2, int n))(_oil_function_class_avg2_12xn_u8.func))(d_12xn, ds1, s1_12xn, ss1, s2_12xn, ss2, n);
}
#undef oil_avg2_16xn_u8
void
-oil_avg2_16xn_u8 (uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n)
+oil_avg2_16xn_u8 (uint8_t * d_16xn, int ds1, const uint8_t * s1_16xn, int ss1, const uint8_t * s2_16xn, int ss2, int n)
{
if (_oil_function_class_avg2_16xn_u8.func == NULL) {
oil_class_optimize (&_oil_function_class_avg2_16xn_u8);
}
- ((void (*)(uint8_t * d_8xn, int ds1, const uint8_t * s1_8xn, int ss1, const uint8_t * s2_8xn, int ss2, int n))(_oil_function_class_avg2_16xn_u8.func))(d_8xn, ds1, s1_8xn, ss1, s2_8xn, ss2, n);
+ ((void (*)(uint8_t * d_16xn, int ds1, const uint8_t * s1_16xn, int ss1, const uint8_t * s2_16xn, int ss2, int n))(_oil_function_class_avg2_16xn_u8.func))(d_16xn, ds1, s1_16xn, ss1, s2_16xn, ss2, n);
}
#undef oil_avg2_8xn_u8
commit 280df4174f03a36a8682384063577e18e67e9890
Author: David Schleef <ds at ginger.bigkitten.com>
Date: Mon Feb 18 18:12:09 2008 -0800
[build] Check for GCC before checking for gcc assembly
diff --git a/m4/as-gcc-inline-assembly.m4 b/m4/as-gcc-inline-assembly.m4
index fe4736f..1211dde 100644
--- a/m4/as-gcc-inline-assembly.m4
+++ b/m4/as-gcc-inline-assembly.m4
@@ -16,6 +16,9 @@ AC_DEFUN([AS_GCC_INLINE_ASSEMBLY],
AC_MSG_CHECKING([if compiler supports gcc-style inline assembly])
AC_TRY_COMPILE([], [
+#ifndef __GNUC__
+#error Not GCC
+#endif
#ifdef __GNUC_MINOR__
#if (__GNUC__ * 1000 + __GNUC_MINOR__) < 3004
#error GCC before 3.4 has critical bugs compiling inline assembly
commit 93dc60204a12d24e197715e09e1b25c03dd067a1
Author: David Schleef <ds at ginger.bigkitten.com>
Date: Mon Feb 18 18:10:04 2008 -0800
[tests] Initialize twice to check for double-init errors
diff --git a/testsuite/moo.c b/testsuite/moo.c
index 01c5069..737553f 100644
--- a/testsuite/moo.c
+++ b/testsuite/moo.c
@@ -32,6 +32,7 @@
int main (int argc, char *argv[])
{
oil_init ();
+ oil_init ();
return 0;
}
commit 87e4ddb3213b036a28dc6e7c230c58de7eb7d34c
Author: David Schleef <ds at ginger.bigkitten.com>
Date: Mon Feb 18 18:09:27 2008 -0800
[build] enable gtk-doc by default, since the macro changed defaults
diff --git a/autogen.sh b/autogen.sh
index 50b222c..d832102 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/bin/sh
autoreconf -i -f &&
-./configure --enable-maintainer-mode --disable-static $@
+./configure --enable-maintainer-mode --disable-static --enable-gtk-doc $@
#./configure --enable-maintainer-mode --disable-static --with-alternate-optimization="-O3 -funroll-all-loops" $@
More information about the Liboil-commit
mailing list