[cogl/cogl-1.16] Fix calculating the bounds when clipping from a primitive

[Neil Roberts <nroberts src gnome org>]

commit 83e31cdf179454994a5e26a0801f272794695eab
Author: Neil Roberts <neil linux intel com>
Date:   Mon Dec 2 18:18:39 2013 +0000

    Fix calculating the bounds when clipping from a primitive
    
    When projecting the bounding rectangle of a primitive it was using the
    modelview matrix twice instead of the modelview and projection
    matrices so it was coming out with garbage.
    
    Reviewed-by: Robert Bragg <robert linux intel com>
    (cherry picked from commit 7e1f05c84013bb91248d691091df00f4f634c6cf)

 cogl/cogl-clip-stack.c            |    2 +-
 tests/conform/test-conform-main.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cogl/cogl-clip-stack.c b/cogl/cogl-clip-stack.c
index 69c066e..bc17724 100644
--- a/cogl/cogl-clip-stack.c
+++ b/cogl/cogl-clip-stack.c
@@ -278,7 +278,7 @@ _cogl_clip_stack_push_primitive (CoglClipStack *stack,
   entry->bounds_y2 = bounds_y2;
 
   cogl_matrix_entry_get (modelview_entry, &modelview);
-  cogl_matrix_entry_get (modelview_entry, &projection);
+  cogl_matrix_entry_get (projection_entry, &projection);
 
   get_transformed_corners (bounds_x1, bounds_y1, bounds_x2, bounds_y2,
                            &modelview,
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index e7842c1..83317d1 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -59,7 +59,7 @@ main (int argc, char **argv)
   UNPORTED_TEST (test_readpixels);
 #ifdef COGL_HAS_COGL_PATH_SUPPORT
   ADD_TEST (test_path, 0, 0);
-  ADD_TEST (test_path_clip, 0, TEST_KNOWN_FAILURE);
+  ADD_TEST (test_path_clip, 0, 0);
 #endif
   ADD_TEST (test_depth_test, 0, 0);
   ADD_TEST (test_color_mask, 0, 0);