diff options
| author | Neil Roberts <neil@linux.intel.com> | 2013-06-11 15:57:38 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-06-13 13:22:46 +0100 |
| commit | a7a8b7aefc8cb03fe8b716bee06b3449a7dba85f (patch) | |
| tree | c5a9c00ab338001e12baf088a65db9c53f9ec5b7 /tests | |
| parent | bfada22d9a7f60baad5ae5615e45f10327e23e36 (diff) | |
| download | cogl-a7a8b7aefc8cb03fe8b716bee06b3449a7dba85f.tar.gz | |
Fix freeing an atlas texture that hasn't been allocated
The free function for atlas textures was previously always assuming
that there will be a valid sub_texture pointer but this might not be
the case if the texture was never successfully allocated. This was
causing Cogl to crash if the application tries to make a texture that
can not fit in the atlas using the automagic texture API.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conform/test-conform-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c index 4d86c087..83a631e8 100644 --- a/tests/conform/test-conform-main.c +++ b/tests/conform/test-conform-main.c @@ -143,7 +143,7 @@ main (int argc, char **argv) ADD_TEST (test_fence, TEST_REQUIREMENT_FENCE, 0); - ADD_TEST (test_texture_no_allocate, 0, TEST_KNOWN_FAILURE); + ADD_TEST (test_texture_no_allocate, 0, 0); g_printerr ("Unknown test name \"%s\"\n", argv[1]); |