From 8c5ac95a696aa6f7fbfa9756f3fc597bbb1333b8 Mon Sep 17 00:00:00 2001
From: Matthew Allum <mallum@openedhand.com>
Date: Fri, 29 Jun 2007 11:54:31 +0000
Subject: [PATCH] 2007-06-29  Matthew Allum  <mallum@openedhand.com>

        * clutter/clutter-texture.c: (texture_upload_data):
        Fix a SEGV for GL ES textures.

        * clutter/cogl/gles/cogl.c: (cogl_setup_viewport):
        Tweak default z_camera for 60 degrees like GL.

        * clutter/egl/clutter-backend-egl.c::
        * clutter/egl/clutter-stage-egl.c:
        Fix edpy usage (thanks to Kaj Gronholm).
---
 gles/cogl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gles/cogl.c b/gles/cogl.c
index 3fb1631aa..123fcdcc5 100644
--- a/gles/cogl.c
+++ b/gles/cogl.c
@@ -521,7 +521,7 @@ cogl_setup_viewport (guint        w,
    *
    * See comments in ../gl/cogl.c
    */
-#define DEFAULT_Z_CAMERA 0.8699f
+#define DEFAULT_Z_CAMERA 0.869f
   z_camera = CLUTTER_FLOAT_TO_FIXED (DEFAULT_Z_CAMERA);
 
   if (fovy != CFX_60)