3881fd3259
This adds experimental 2.0 api replacements for the cogl_rectangle[_*] functions that don't depend on having a current pipeline set on the context via cogl_{set,push}_source() or having a current framebuffer set on the context via cogl_push_framebuffer(). The aim for 2.0 is to switch away from having a statefull context that affects drawing to having framebuffer drawing apis that are explicitly passed a framebuffer and pipeline. To test this change several of the conformance tests were updated to use this api instead of cogl_rectangle and cogl_rectangle_with_texture_coords. Since it's quite laborious going through all of the conformance tests the opportunity was taken to make other clean ups in the conformance tests to replace other uses of 1.x api with experimental 2.0 api so long as that didn't affect what was being tested.
295 lines
8.4 KiB
C
295 lines
8.4 KiB
C
#include <cogl/cogl.h>
|
|
#include <string.h>
|
|
|
|
#include "test-utils.h"
|
|
|
|
#define TEX_SIZE 4
|
|
|
|
typedef struct _TestState
|
|
{
|
|
int width;
|
|
int height;
|
|
CoglTexture *texture;
|
|
} TestState;
|
|
|
|
static CoglTexture *
|
|
create_texture (CoglTextureFlags flags)
|
|
{
|
|
guint8 *data = g_malloc (TEX_SIZE * TEX_SIZE * 4), *p = data;
|
|
CoglTexture *tex;
|
|
int x, y;
|
|
|
|
for (y = 0; y < TEX_SIZE; y++)
|
|
for (x = 0; x < TEX_SIZE; x++)
|
|
{
|
|
*(p++) = 0;
|
|
*(p++) = (x & 1) * 255;
|
|
*(p++) = (y & 1) * 255;
|
|
*(p++) = 255;
|
|
}
|
|
|
|
tex = cogl_texture_new_from_data (TEX_SIZE, TEX_SIZE, flags,
|
|
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
COGL_PIXEL_FORMAT_ANY,
|
|
TEX_SIZE * 4,
|
|
data);
|
|
g_free (data);
|
|
|
|
return tex;
|
|
}
|
|
|
|
static CoglPipeline *
|
|
create_pipeline (TestState *state,
|
|
CoglPipelineWrapMode wrap_mode_s,
|
|
CoglPipelineWrapMode wrap_mode_t)
|
|
{
|
|
CoglPipeline *pipeline;
|
|
|
|
pipeline = cogl_pipeline_new (ctx);
|
|
cogl_pipeline_set_layer_texture (pipeline, 0, state->texture);
|
|
cogl_pipeline_set_layer_filters (pipeline, 0,
|
|
COGL_PIPELINE_FILTER_NEAREST,
|
|
COGL_PIPELINE_FILTER_NEAREST);
|
|
cogl_pipeline_set_layer_wrap_mode_s (pipeline, 0, wrap_mode_s);
|
|
cogl_pipeline_set_layer_wrap_mode_t (pipeline, 0, wrap_mode_t);
|
|
|
|
return pipeline;
|
|
}
|
|
|
|
static CoglPipelineWrapMode
|
|
wrap_modes[] =
|
|
{
|
|
COGL_PIPELINE_WRAP_MODE_REPEAT,
|
|
COGL_PIPELINE_WRAP_MODE_REPEAT,
|
|
|
|
COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE,
|
|
COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE,
|
|
|
|
COGL_PIPELINE_WRAP_MODE_REPEAT,
|
|
COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE,
|
|
|
|
COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE,
|
|
COGL_PIPELINE_WRAP_MODE_REPEAT,
|
|
|
|
COGL_PIPELINE_WRAP_MODE_AUTOMATIC,
|
|
COGL_PIPELINE_WRAP_MODE_AUTOMATIC,
|
|
|
|
COGL_PIPELINE_WRAP_MODE_AUTOMATIC,
|
|
COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE
|
|
};
|
|
|
|
static void
|
|
draw_tests (TestState *state)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (wrap_modes); i += 2)
|
|
{
|
|
CoglPipelineWrapMode wrap_mode_s, wrap_mode_t;
|
|
CoglPipeline *pipeline;
|
|
|
|
/* Create a separate pipeline for each pair of wrap modes so
|
|
that we can verify whether the batch splitting works */
|
|
wrap_mode_s = wrap_modes[i];
|
|
wrap_mode_t = wrap_modes[i + 1];
|
|
pipeline = create_pipeline (state, wrap_mode_s, wrap_mode_t);
|
|
/* Render the pipeline at four times the size of the texture */
|
|
cogl_framebuffer_draw_textured_rectangle (fb,
|
|
pipeline,
|
|
i * TEX_SIZE,
|
|
0,
|
|
(i + 2) * TEX_SIZE,
|
|
TEX_SIZE * 2,
|
|
0, 0, 2, 2);
|
|
cogl_object_unref (pipeline);
|
|
}
|
|
}
|
|
|
|
static const CoglTextureVertex vertices[4] =
|
|
{
|
|
{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
|
|
{ 0.0f, TEX_SIZE * 2, 0.0f, 0.0f, 2.0f },
|
|
{ TEX_SIZE * 2, TEX_SIZE * 2, 0.0f, 2.0f, 2.0f },
|
|
{ TEX_SIZE * 2, 0.0f, 0.0f, 2.0f, 0.0f }
|
|
};
|
|
|
|
static void
|
|
draw_tests_polygon (TestState *state)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (wrap_modes); i += 2)
|
|
{
|
|
CoglPipelineWrapMode wrap_mode_s, wrap_mode_t;
|
|
CoglPipeline *pipeline;
|
|
|
|
wrap_mode_s = wrap_modes[i];
|
|
wrap_mode_t = wrap_modes[i + 1];
|
|
pipeline = create_pipeline (state, wrap_mode_s, wrap_mode_t);
|
|
cogl_set_source (pipeline);
|
|
cogl_object_unref (pipeline);
|
|
cogl_push_matrix ();
|
|
cogl_translate (TEX_SIZE * i, 0.0f, 0.0f);
|
|
/* Render the pipeline at four times the size of the texture */
|
|
cogl_polygon (vertices, G_N_ELEMENTS (vertices), FALSE);
|
|
cogl_pop_matrix ();
|
|
}
|
|
}
|
|
|
|
static void
|
|
draw_tests_vbo (TestState *state)
|
|
{
|
|
CoglHandle vbo;
|
|
int i;
|
|
|
|
vbo = cogl_vertex_buffer_new (4);
|
|
cogl_vertex_buffer_add (vbo, "gl_Vertex", 3,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT, FALSE,
|
|
sizeof (vertices[0]),
|
|
&vertices[0].x);
|
|
cogl_vertex_buffer_add (vbo, "gl_MultiTexCoord0", 2,
|
|
COGL_ATTRIBUTE_TYPE_FLOAT, FALSE,
|
|
sizeof (vertices[0]),
|
|
&vertices[0].tx);
|
|
cogl_vertex_buffer_submit (vbo);
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (wrap_modes); i += 2)
|
|
{
|
|
CoglPipelineWrapMode wrap_mode_s, wrap_mode_t;
|
|
CoglPipeline *pipeline;
|
|
|
|
wrap_mode_s = wrap_modes[i];
|
|
wrap_mode_t = wrap_modes[i + 1];
|
|
pipeline = create_pipeline (state, wrap_mode_s, wrap_mode_t);
|
|
cogl_set_source (pipeline);
|
|
cogl_object_unref (pipeline);
|
|
cogl_push_matrix ();
|
|
cogl_translate (TEX_SIZE * i, 0.0f, 0.0f);
|
|
/* Render the pipeline at four times the size of the texture */
|
|
cogl_vertex_buffer_draw (vbo, COGL_VERTICES_MODE_TRIANGLE_FAN, 0, 4);
|
|
cogl_pop_matrix ();
|
|
}
|
|
|
|
cogl_handle_unref (vbo);
|
|
}
|
|
|
|
static void
|
|
validate_set (TestState *state, int offset)
|
|
{
|
|
guint8 data[TEX_SIZE * 2 * TEX_SIZE * 2 * 4], *p;
|
|
int x, y, i;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (wrap_modes); i += 2)
|
|
{
|
|
CoglPipelineWrapMode wrap_mode_s, wrap_mode_t;
|
|
|
|
wrap_mode_s = wrap_modes[i];
|
|
wrap_mode_t = wrap_modes[i + 1];
|
|
|
|
cogl_framebuffer_read_pixels (fb, i * TEX_SIZE, offset * TEX_SIZE * 2,
|
|
TEX_SIZE * 2, TEX_SIZE * 2,
|
|
COGL_PIXEL_FORMAT_RGBA_8888,
|
|
data);
|
|
|
|
p = data;
|
|
|
|
for (y = 0; y < TEX_SIZE * 2; y++)
|
|
for (x = 0; x < TEX_SIZE * 2; x++)
|
|
{
|
|
guint8 green, blue;
|
|
|
|
if (x < TEX_SIZE ||
|
|
wrap_mode_s == COGL_PIPELINE_WRAP_MODE_REPEAT ||
|
|
wrap_mode_s == COGL_PIPELINE_WRAP_MODE_AUTOMATIC)
|
|
green = (x & 1) * 255;
|
|
else
|
|
green = ((TEX_SIZE - 1) & 1) * 255;
|
|
|
|
if (y < TEX_SIZE ||
|
|
wrap_mode_t == COGL_PIPELINE_WRAP_MODE_REPEAT ||
|
|
wrap_mode_t == COGL_PIPELINE_WRAP_MODE_AUTOMATIC)
|
|
blue = (y & 1) * 255;
|
|
else
|
|
blue = ((TEX_SIZE - 1) & 1) * 255;
|
|
|
|
g_assert_cmpint (p[0], ==, 0);
|
|
g_assert_cmpint (p[1], ==, green);
|
|
g_assert_cmpint (p[2], ==, blue);
|
|
|
|
p += 4;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
validate_result (TestState *state)
|
|
{
|
|
validate_set (state, 0); /* non-atlased rectangle */
|
|
#if 0 /* this doesn't currently work */
|
|
validate_set (state, 1); /* atlased rectangle */
|
|
#endif
|
|
validate_set (state, 2); /* cogl_polygon */
|
|
validate_set (state, 3); /* vertex buffer */
|
|
}
|
|
|
|
static void
|
|
paint (TestState *state)
|
|
{
|
|
/* Draw the tests first with a non atlased texture */
|
|
state->texture = create_texture (COGL_TEXTURE_NO_ATLAS);
|
|
draw_tests (state);
|
|
cogl_object_unref (state->texture);
|
|
|
|
/* Draw the tests again with a possible atlased texture. This should
|
|
end up testing software repeats */
|
|
state->texture = create_texture (COGL_TEXTURE_NONE);
|
|
cogl_push_matrix ();
|
|
cogl_translate (0.0f, TEX_SIZE * 2.0f, 0.0f);
|
|
draw_tests (state);
|
|
cogl_pop_matrix ();
|
|
cogl_object_unref (state->texture);
|
|
|
|
/* Draw the tests using cogl_polygon */
|
|
state->texture = create_texture (COGL_TEXTURE_NO_ATLAS);
|
|
cogl_push_matrix ();
|
|
cogl_translate (0.0f, TEX_SIZE * 4.0f, 0.0f);
|
|
draw_tests_polygon (state);
|
|
cogl_pop_matrix ();
|
|
cogl_object_unref (state->texture);
|
|
|
|
/* Draw the tests using a vertex buffer */
|
|
state->texture = create_texture (COGL_TEXTURE_NO_ATLAS);
|
|
cogl_push_matrix ();
|
|
cogl_translate (0.0f, TEX_SIZE * 6.0f, 0.0f);
|
|
draw_tests_vbo (state);
|
|
cogl_pop_matrix ();
|
|
cogl_object_unref (state->texture);
|
|
|
|
validate_result (state);
|
|
}
|
|
|
|
void
|
|
test_wrap_modes (void)
|
|
{
|
|
TestState state;
|
|
|
|
state.width = cogl_framebuffer_get_width (fb);
|
|
state.height = cogl_framebuffer_get_height (fb);
|
|
|
|
cogl_framebuffer_orthographic (fb,
|
|
0, 0,
|
|
state.width,
|
|
state.height,
|
|
-1,
|
|
100);
|
|
|
|
/* XXX: we have to push/pop a framebuffer since this test currently
|
|
* uses the legacy cogl_vertex_buffer_draw() api. */
|
|
cogl_push_framebuffer (fb);
|
|
paint (&state);
|
|
cogl_pop_framebuffer ();
|
|
|
|
if (cogl_test_verbose ())
|
|
g_print ("OK\n");
|
|
}
|