diff options
| author | Neil Roberts <neil@linux.intel.com> | 2013-12-02 18:18:39 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-12-03 12:00:18 +0000 |
| commit | 7e1f05c84013bb91248d691091df00f4f634c6cf (patch) | |
| tree | 25dd8ae44cb7012aafc7e24288ab0d4bc5811ffc | |
| parent | 5404033220099b4a3c6cf32a0d269c4e98489fee (diff) | |
| download | cogl-7e1f05c84013bb91248d691091df00f4f634c6cf.tar.gz | |
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>
| -rw-r--r-- | cogl/cogl-clip-stack.c | 2 | ||||
| -rw-r--r-- | 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 2e909aec..40056bb8 100644 --- a/cogl/cogl-clip-stack.c +++ b/cogl/cogl-clip-stack.c @@ -276,7 +276,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 572235bb..116d29d2 100644 --- a/tests/conform/test-conform-main.c +++ b/tests/conform/test-conform-main.c @@ -58,7 +58,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); |