isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-10 04:34:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of binding errors when uploading a full texture

Browse Source 
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)
This commit is contained in:
Neil Roberts
2012-11-27 20:07:47 +00:00
committed by Robert Bragg
parent c72ede0560
commit 6bcfc8342a
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/conform/test-conform-main.c
View File

@ -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);

4
tests/conform/test-pixel-buffer.c
View File

@ -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);