summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2013-03-09 20:00:53 +0000
committerNeil Roberts <neil@linux.intel.com>2013-03-19 17:53:43 +0000
commit22363a41377b68b592b1f777aacfe273fe8ae157 (patch)
treec5980feccf66f31a71e1276fba3a9a2a147efa0b /tests
parentf9456574ef18cd58bccdd7ac69ac76f1267c84b5 (diff)
downloadcogl-22363a41377b68b592b1f777aacfe273fe8ae157.tar.gz
Prune redundant pipeline ancestry after adding a layer difference
Adding a layer difference may mean the pipeline overrides all of the layers of its parent which might make the parent redundant so we should try to prune the hierarchy. This is particularly important for CoglGst because whenever a new frame is ready it tries to make a copy of the pipeline it last used and then replace all of the textures in the layers. Without this patch the new pipeline would keep the parent pipeline alive which means also keeping the old textures alive so all of the frames of the video would effectively be leaked. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 576c7b55aa835448c977f1d79d128dffd40e7cd8)
Diffstat (limited to 'tests')
-rw-r--r--tests/conform/test-conform-main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index 4110c821..0b55db6f 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -118,7 +118,7 @@ main (int argc, char **argv)
ADD_TEST (test_primitive_and_journal, 0, 0);
- ADD_TEST (test_copy_replace_texture, 0, TEST_KNOWN_FAILURE);
+ ADD_TEST (test_copy_replace_texture, 0, 0);
UNPORTED_TEST (test_viewport);