isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-02 04:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make test-cogl-npot-texture a bit more extensive

Browse Source 
The size of the texture used for test-cogl-npot-texture was only using
1 pixel of waste and the texture was scaled down so it would be quite
likely that the test would still pass if only the top left slice was
rendered. It also didn't test using non-default texture
coordinates. These problems made it fail to pick up bug 2398. The
texture is now using the maximum amount of waste and rendered in four
parts at 1:1 scale.
This commit is contained in:
Neil Roberts 2010-11-05 18:33:37 +00:00
parent cc63c7dd8f
commit 57633520d4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/conform/test-cogl-npot-texture.c
View File

@ -7,7 +7,7 @@
static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff }; static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
/* Non-power-of-two sized texture that should cause slicing */ /* Non-power-of-two sized texture that should cause slicing */
#define TEXTURE_SIZE 257 #define TEXTURE_SIZE 384
/* Number of times to split the texture up on each axis */ /* Number of times to split the texture up on each axis */
#define PARTS 2 #define PARTS 2
/* The texture is split into four parts, each with a different colour */ /* The texture is split into four parts, each with a different colour */
@ -18,7 +18,7 @@ static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
#define TEST_INSET 4 #define TEST_INSET 4
/* Size to actually render the texture at */ /* Size to actually render the texture at */
#define TEXTURE_RENDER_SIZE 128 #define TEXTURE_RENDER_SIZE TEXTURE_SIZE
/* The size of a part once rendered */ /* The size of a part once rendered */
#define PART_RENDER_SIZE (TEXTURE_RENDER_SIZE / PARTS) #define PART_RENDER_SIZE (TEXTURE_RENDER_SIZE / PARTS)
@ -90,10 +90,21 @@ static void
on_paint (ClutterActor *actor, TestState *state) on_paint (ClutterActor *actor, TestState *state)
{ {
int frame_num; int frame_num;
int y, x;
/* Just render the texture in the top left corner */ /* Just render the texture in the top left corner */
cogl_set_source_texture (state->texture); cogl_set_source_texture (state->texture);
cogl_rectangle (0, 0, TEXTURE_RENDER_SIZE, TEXTURE_RENDER_SIZE); /* Render the texture using four separate rectangles */
for (y = 0; y < 2; y++)
for (x = 0; x < 2; x++)
cogl_rectangle_with_texture_coords (x * TEXTURE_RENDER_SIZE / 2,
y * TEXTURE_RENDER_SIZE / 2,
(x + 1) * TEXTURE_RENDER_SIZE / 2,
(y + 1) * TEXTURE_RENDER_SIZE / 2,
x / 2.0f,
y / 2.0f,
(x + 1) / 2.0f,
(y + 1) / 2.0f);
/* XXX: validate_result calls clutter_stage_read_pixels which will result in /* XXX: validate_result calls clutter_stage_read_pixels which will result in
* another paint run so to avoid infinite recursion we only aim to validate * another paint run so to avoid infinite recursion we only aim to validate