diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-11-27 20:07:47 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-01-22 17:48:09 +0000 |
| commit | 6bcfc8342a0281d8458fb9e18e62234fcab19c4d (patch) | |
| tree | d05a89dd8c1778e6fd9b4ff18d5666a493cd93b2 /tests | |
| parent | c72ede05605eff6f51ac0797e437821e1f66fcd9 (diff) | |
| download | cogl-6bcfc8342a0281d8458fb9e18e62234fcab19c4d.tar.gz | |
Fix handling of binding errors when uploading a full texture
Both the texture drivers weren't handling errors correctly when a
CoglPixelBuffer was used to set the contents of an entire texture.
This was causing it to hit an assertion failure in the pixel buffer
tests.
Reviewed-by: Robert Bragg <robert@linux.intel.com>
(cherry picked from commit 888733d3c3b24080d2f136cedb3876a41312e4cf)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conform/test-conform-main.c | 4 | ||||
| -rw-r--r-- | tests/conform/test-pixel-buffer.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c index 2ebc31bc..fc566c17 100644 --- a/tests/conform/test-conform-main.c +++ b/tests/conform/test-conform-main.c @@ -68,8 +68,8 @@ main (int argc, char **argv) UNPORTED_TEST (test_multitexture); UNPORTED_TEST (test_texture_mipmaps); ADD_TEST (test_sub_texture, 0, 0); - ADD_TEST (test_pixel_buffer_map, 0, TEST_KNOWN_FAILURE); - ADD_TEST (test_pixel_buffer_set_data, 0, TEST_KNOWN_FAILURE); + ADD_TEST (test_pixel_buffer_map, 0, 0); + ADD_TEST (test_pixel_buffer_set_data, 0, 0); ADD_TEST (test_pixel_buffer_sub_region, 0, 0); UNPORTED_TEST (test_texture_rectangle); ADD_TEST (test_texture_3d, TEST_REQUIREMENT_TEXTURE_3D, 0); diff --git a/tests/conform/test-pixel-buffer.c b/tests/conform/test-pixel-buffer.c index 3d08f1c8..24de2e4b 100644 --- a/tests/conform/test-pixel-buffer.c +++ b/tests/conform/test-pixel-buffer.c @@ -247,8 +247,8 @@ test_pixel_buffer_sub_region (void) BITMAP_SIZE / 2, /* src_y */ BITMAP_SIZE / 2, /* dst_x */ 0, /* dst_y */ - BITMAP_SIZE / 2, /* dst_width */ - BITMAP_SIZE / 2, /* dst_height */ + BITMAP_SIZE / 2, /* width */ + BITMAP_SIZE / 2, /* height */ bitmap); pipeline = create_pipeline_from_texture (texture); |