[cogl/msvc-support: 54/54] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support: 54/54] Merge branch 'master' into msvc-support
- Date: Thu, 3 Nov 2011 07:38:43 +0000 (UTC)
commit f756ec39e1a3d02fb43dadec5de75be87abc47f1
Merge: 344613a 00f0a66
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Nov 3 15:37:47 2011 +0800
Merge branch 'master' into msvc-support
Conflicts:
cogl/cogl-sub-texture.c
cogl/cogl-texture-2d.c
cogl/cogl-texture-3d.c
cogl/cogl-texture-rectangle.c
cogl/cogl-texture.c
cogl/cogl-util.h
cogl-pango/cogl-pango-display-list.c | 5 +-
cogl-pango/cogl-pango-render.c | 16 +-
cogl/Makefile.am | 9 +
cogl/cogl-atlas-texture.c | 34 +-
cogl/cogl-attribute-buffer.c | 5 +-
cogl/cogl-attribute.c | 15 +-
cogl/cogl-bitmap-pixbuf.c | 7 +-
cogl/cogl-bitmap.c | 5 +-
cogl/cogl-blit.c | 5 +-
cogl/cogl-buffer.c | 36 +-
cogl/cogl-clip-stack.c | 347 +++++++--
cogl/cogl-clip-stack.h | 29 +-
cogl/cogl-clip-state.c | 28 +-
cogl/cogl-clutter-xlib.h | 41 +
cogl/cogl-clutter.c | 7 +-
cogl/cogl-clutter.h | 10 -
cogl/cogl-color.c | 11 +-
cogl/cogl-context-private.h | 3 +-
cogl/cogl-context.c | 37 +-
cogl/cogl-depth-state.c | 17 +-
cogl/cogl-depth-state.h | 4 +-
cogl/cogl-display.c | 4 +-
cogl/cogl-euler.c | 5 +-
cogl/cogl-ext-functions.h | 41 +-
cogl/cogl-framebuffer-private.h | 80 +-
cogl/cogl-framebuffer.c | 805 +++++++++-----------
cogl/cogl-framebuffer.h | 369 +++++----
cogl/cogl-index-buffer.c | 5 +-
cogl/cogl-indices.c | 15 +-
cogl/cogl-indices.h | 53 ++-
cogl/cogl-internal.h | 7 +-
cogl/cogl-journal.c | 4 +-
cogl/cogl-matrix.c | 29 +-
cogl/cogl-meta-texture.c | 636 ++++++++++++++++
cogl/cogl-meta-texture.h | 181 +++++
cogl/cogl-node.c | 3 +-
cogl/cogl-object.c | 7 +-
cogl/cogl-onscreen-private.h | 63 ++
cogl/cogl-onscreen-template-private.h | 3 +-
cogl/cogl-onscreen-template.c | 28 +-
cogl/cogl-onscreen-template.h | 28 +
cogl/cogl-onscreen.c | 345 +++++++++
cogl/cogl-onscreen.h | 258 +++++++
cogl/cogl-path-private.h | 4 +
cogl/cogl-path.c | 3 +-
cogl/cogl-pipeline-fragend-arbfp.c | 2 +-
cogl/cogl-pipeline-fragend-glsl.c | 32 +-
cogl/cogl-pipeline-layer-private.h | 4 +
cogl/cogl-pipeline-layer-state.c | 50 +-
cogl/cogl-pipeline-layer-state.h | 3 +-
cogl/cogl-pipeline-layer.c | 4 +-
cogl/cogl-pipeline-opengl.c | 20 +-
cogl/cogl-pipeline-private.h | 3 +-
cogl/cogl-pipeline-progend-glsl.c | 47 +-
cogl/cogl-pipeline-state.c | 72 +-
cogl/cogl-pipeline-vertend-fixed.c | 3 +-
cogl/cogl-pipeline-vertend-glsl.c | 29 +-
cogl/cogl-pipeline.c | 26 +-
cogl/cogl-pixel-buffer.c | 2 +-
cogl/cogl-primitive-private.h | 5 +
cogl/cogl-primitive.c | 66 +-
cogl/cogl-primitive.h | 152 ++++-
cogl/cogl-primitives.c | 167 +---
cogl/cogl-program.c | 29 +-
cogl/cogl-quaternion.c | 9 +-
cogl/cogl-rectangle-map.c | 3 +-
cogl/cogl-renderer.c | 12 +-
cogl/cogl-shader.c | 12 +-
cogl/cogl-spans.c | 74 ++-
cogl/cogl-spans.h | 46 +-
cogl/cogl-sub-texture-private.h | 24 +-
cogl/cogl-sub-texture.c | 261 +++----
cogl/cogl-sub-texture.h | 110 +++
cogl/cogl-texture-2d-sliced-private.h | 22 +-
cogl/cogl-texture-2d-sliced.c | 435 ++++-------
cogl/cogl-texture-2d-sliced.h | 104 +++
cogl/cogl-texture-2d.c | 93 +--
cogl/cogl-texture-2d.h | 12 +-
cogl/cogl-texture-3d.c | 86 +--
cogl/cogl-texture-private.h | 45 +-
cogl/cogl-texture-rectangle-private.h | 15 +-
cogl/cogl-texture-rectangle.c | 163 ++---
cogl/cogl-texture-rectangle.h | 118 +++
cogl/cogl-texture.c | 311 ++++----
cogl/cogl-texture.h | 46 +-
cogl/cogl-types.h | 11 +-
cogl/cogl-util.c | 1 -
cogl/cogl-util.h | 30 +
cogl/cogl-vector.c | 13 +-
cogl/cogl-vertex-buffer.c | 6 +-
cogl/cogl-xlib-renderer.c | 5 +-
cogl/cogl-xlib-renderer.h | 7 +-
cogl/cogl-xlib.c | 3 +-
cogl/cogl-xlib.h | 14 +-
cogl/cogl.c | 52 +-
cogl/cogl.h | 200 +++++-
cogl/cogl2-path.c | 258 ++-----
cogl/driver/gl/cogl-gl.c | 79 ++-
cogl/driver/gl/cogl-texture-driver-gl.c | 4 +-
cogl/driver/gles/cogl-gles.c | 72 ++-
cogl/winsys/cogl-texture-pixmap-x11.c | 82 ++-
cogl/winsys/cogl-texture-pixmap-x11.h | 10 +
cogl/winsys/cogl-winsys-egl.c | 253 ++++---
cogl/winsys/cogl-winsys-glx.c | 150 +++-
cogl/winsys/cogl-winsys-private.h | 2 +-
cogl/winsys/cogl-winsys-wgl.c | 38 +-
configure.ac | 21 +
doc/reference/cogl-2.0-experimental/Makefile.am | 8 +-
.../cogl-2.0-experimental-docs.xml.in | 10 +
.../cogl-2.0-experimental-sections.txt | 76 ++-
doc/reference/cogl/Makefile.am | 1 +
examples/Makefile.am | 6 +-
examples/cogl-crate.c | 41 +-
examples/cogl-info.c | 140 ++++
examples/cogl-msaa.c | 112 +++
examples/cogl-x11-foreign.c | 1 +
examples/cogl-x11-tfp.c | 1 +
po/es.po | 17 +-
tests/conform/Makefile.am | 4 +-
tests/conform/test-backface-culling.c | 2 -
tests/conform/test-blend-strings.c | 26 +-
tests/conform/test-color-mask.c | 30 +-
tests/conform/test-conform-main.c | 4 +-
tests/conform/test-depth-test.c | 39 +-
tests/conform/test-just-vertex-shader.c | 65 +-
tests/conform/test-materials.c | 46 +-
tests/conform/test-premult.c | 41 +-
tests/conform/test-sub-texture.c | 294 +++-----
tests/conform/test-utils.c | 63 ++
tests/conform/test-utils.h | 50 ++
tests/conform/test-wrap-modes.c | 218 +++---
131 files changed, 5843 insertions(+), 3127 deletions(-)
---
diff --cc cogl/cogl-util.h
index df8f092,44bb501..f90da61
--- a/cogl/cogl-util.h
+++ b/cogl/cogl-util.h
@@@ -103,24 -107,30 +107,50 @@@ in
_cogl_util_ffs (int num);
#endif
+/* MSVC appears to have a bug in its implementation of modff for i386
+ * architecture so we instead use the double version there. There
+ * is a comment about this bug here:
+ *
+ * http://connect.microsoft.com/VisualStudio/feedback/details/ \
+ * 432366/modff-corrupts-stack
+ */
+#if (defined(_MSC_VER) && defined(_M_IX86))
+static inline float
+cogl_modff (float value, float *int_part)
+{
+ double frac_part_double, int_part_double;
+ frac_part_double = modf (value, &int_part_double);
+ *int_part = int_part_double;
+ return frac_part_double;
+}
+#else /* _MSC_VER && _M_IX86 */
+#define cogl_modff modff
+#endif /* _MSC_VER && _M_IX86 */
+
+ #ifdef COGL_HAS_GLIB_SUPPORT
+ #define _COGL_RETURN_IF_FAIL(EXPR) g_return_if_fail(EXPR)
+ #define _COGL_RETURN_VAL_IF_FAIL(EXPR, VAL) g_return_val_if_fail(EXPR, VAL)
+ #else
+ #define _COGL_RETURN_IF_FAIL(EXPR) do { \
+ if (!(EXPR)) \
+ { \
+ fprintf (stderr, "file %s: line %d: assertion `%s' failed", \
+ __FILE__, \
+ __LINE__, \
+ #EXPR); \
+ return; \
+ }; \
+ } while(0)
+ #define _COGL_RETURN_VAL_IF_FAIL(EXPR, VAL) do { \
+ if (!(EXPR)) \
+ { \
+ fprintf (stderr, "file %s: line %d: assertion `%s' failed", \
+ __FILE__, \
+ __LINE__, \
+ #EXPR); \
+ return (VAL); \
+ }; \
+ } while(0)
+ #endif /* COGL_HAS_GLIB_SUPPORT */
+
#endif /* __COGL_UTIL_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
