2012-02-09 17:54:07 +00:00
|
|
|
#include <cogl/cogl2-experimental.h>
|
2011-05-05 22:34:38 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
2012-02-09 17:54:07 +00:00
|
|
|
#include "test-utils.h"
|
2011-05-05 22:34:38 +00:00
|
|
|
|
|
|
|
#define TEX_WIDTH 4
|
|
|
|
#define TEX_HEIGHT 8
|
|
|
|
#define TEX_DEPTH 16
|
|
|
|
/* Leave four bytes of padding between each row */
|
|
|
|
#define TEX_ROWSTRIDE (TEX_WIDTH * 4 + 4)
|
|
|
|
/* Leave four rows of padding between each image */
|
|
|
|
#define TEX_IMAGE_STRIDE ((TEX_HEIGHT + 4) * TEX_ROWSTRIDE)
|
|
|
|
|
2012-02-09 17:54:07 +00:00
|
|
|
typedef struct _TestState
|
|
|
|
{
|
|
|
|
int fb_width;
|
|
|
|
int fb_height;
|
|
|
|
} TestState;
|
|
|
|
|
2012-02-18 02:11:34 +00:00
|
|
|
static CoglTexture3D *
|
|
|
|
create_texture_3d (CoglContext *context)
|
2011-05-05 22:34:38 +00:00
|
|
|
{
|
|
|
|
int x, y, z;
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
uint8_t *data = g_malloc (TEX_IMAGE_STRIDE * TEX_DEPTH);
|
|
|
|
uint8_t *p = data;
|
2012-02-18 02:11:34 +00:00
|
|
|
CoglTexture3D *tex;
|
2012-08-31 18:28:27 +00:00
|
|
|
CoglError *error = NULL;
|
2011-05-05 22:34:38 +00:00
|
|
|
|
|
|
|
for (z = 0; z < TEX_DEPTH; z++)
|
|
|
|
{
|
|
|
|
for (y = 0; y < TEX_HEIGHT; y++)
|
|
|
|
{
|
|
|
|
for (x = 0; x < TEX_WIDTH; x++)
|
|
|
|
{
|
|
|
|
/* Set red, green, blue to values based on x, y, z */
|
|
|
|
*(p++) = 255 - x * 8;
|
|
|
|
*(p++) = y * 8;
|
|
|
|
*(p++) = 255 - z * 8;
|
|
|
|
/* Fully opaque */
|
|
|
|
*(p++) = 0xff;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the padding between rows to 0xde */
|
|
|
|
memset (p, 0xde, TEX_ROWSTRIDE - (TEX_WIDTH * 4));
|
|
|
|
p += TEX_ROWSTRIDE - (TEX_WIDTH * 4);
|
|
|
|
}
|
|
|
|
/* Set the padding between images to 0xad */
|
|
|
|
memset (p, 0xba, TEX_IMAGE_STRIDE - (TEX_HEIGHT * TEX_ROWSTRIDE));
|
|
|
|
p += TEX_IMAGE_STRIDE - (TEX_HEIGHT * TEX_ROWSTRIDE);
|
|
|
|
}
|
|
|
|
|
2012-02-18 02:11:34 +00:00
|
|
|
tex = cogl_texture_3d_new_from_data (context,
|
|
|
|
TEX_WIDTH, TEX_HEIGHT, TEX_DEPTH,
|
2011-05-05 22:34:38 +00:00
|
|
|
COGL_PIXEL_FORMAT_RGBA_8888,
|
|
|
|
COGL_PIXEL_FORMAT_ANY,
|
|
|
|
TEX_ROWSTRIDE,
|
|
|
|
TEX_IMAGE_STRIDE,
|
|
|
|
data,
|
|
|
|
&error);
|
|
|
|
|
2012-02-18 02:11:34 +00:00
|
|
|
if (tex == NULL)
|
2011-05-05 22:34:38 +00:00
|
|
|
{
|
|
|
|
g_assert (error != NULL);
|
|
|
|
g_warning ("Failed to create 3D texture: %s", error->message);
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free (data);
|
|
|
|
|
|
|
|
return tex;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-02-09 17:54:07 +00:00
|
|
|
draw_frame (TestState *state)
|
2011-05-05 22:34:38 +00:00
|
|
|
{
|
2012-03-16 19:54:13 +00:00
|
|
|
CoglTexture *tex = COGL_TEXTURE (create_texture_3d (ctx));
|
|
|
|
CoglPipeline *pipeline = cogl_pipeline_new (ctx);
|
2011-05-05 22:34:38 +00:00
|
|
|
typedef struct { float x, y, s, t, r; } Vert;
|
2012-02-09 17:54:07 +00:00
|
|
|
CoglPrimitive *primitive;
|
|
|
|
CoglAttributeBuffer *attribute_buffer;
|
|
|
|
CoglAttribute *attributes[2];
|
2011-05-05 22:34:38 +00:00
|
|
|
Vert *verts, *v;
|
|
|
|
int i;
|
|
|
|
|
2012-02-09 17:54:07 +00:00
|
|
|
cogl_pipeline_set_layer_texture (pipeline, 0, tex);
|
|
|
|
cogl_object_unref (tex);
|
|
|
|
cogl_pipeline_set_layer_filters (pipeline, 0,
|
|
|
|
COGL_PIPELINE_FILTER_NEAREST,
|
|
|
|
COGL_PIPELINE_FILTER_NEAREST);
|
2011-05-05 22:34:38 +00:00
|
|
|
|
|
|
|
/* Render the texture repeated horizontally twice using a regular
|
|
|
|
cogl rectangle. This should end up with the r texture coordinates
|
|
|
|
as zero */
|
2012-03-16 19:54:13 +00:00
|
|
|
cogl_framebuffer_draw_textured_rectangle (fb, pipeline,
|
|
|
|
0.0f, 0.0f, TEX_WIDTH * 2, TEX_HEIGHT,
|
|
|
|
0.0f, 0.0f, 2.0f, 1.0f);
|
2012-02-09 17:54:07 +00:00
|
|
|
|
|
|
|
/* Render all of the images in the texture using coordinates from a
|
|
|
|
CoglPrimitive */
|
2011-05-05 22:34:38 +00:00
|
|
|
v = verts = g_new (Vert, 4 * TEX_DEPTH);
|
|
|
|
for (i = 0; i < TEX_DEPTH; i++)
|
|
|
|
{
|
|
|
|
float r = (i + 0.5f) / TEX_DEPTH;
|
|
|
|
|
|
|
|
v->x = i * TEX_WIDTH;
|
|
|
|
v->y = TEX_HEIGHT;
|
|
|
|
v->s = 0;
|
|
|
|
v->t = 0;
|
|
|
|
v->r = r;
|
|
|
|
v++;
|
|
|
|
|
|
|
|
v->x = i * TEX_WIDTH;
|
|
|
|
v->y = TEX_HEIGHT * 2;
|
|
|
|
v->s = 0;
|
|
|
|
v->t = 1;
|
|
|
|
v->r = r;
|
|
|
|
v++;
|
|
|
|
|
|
|
|
v->x = i * TEX_WIDTH + TEX_WIDTH;
|
|
|
|
v->y = TEX_HEIGHT * 2;
|
|
|
|
v->s = 1;
|
|
|
|
v->t = 1;
|
|
|
|
v->r = r;
|
|
|
|
v++;
|
|
|
|
|
|
|
|
v->x = i * TEX_WIDTH + TEX_WIDTH;
|
|
|
|
v->y = TEX_HEIGHT;
|
|
|
|
v->s = 1;
|
|
|
|
v->t = 0;
|
|
|
|
v->r = r;
|
|
|
|
v++;
|
|
|
|
}
|
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
attribute_buffer = cogl_attribute_buffer_new (ctx,
|
2012-02-09 17:54:07 +00:00
|
|
|
4 * TEX_DEPTH * sizeof (Vert),
|
|
|
|
verts);
|
|
|
|
attributes[0] = cogl_attribute_new (attribute_buffer,
|
|
|
|
"cogl_position_in",
|
|
|
|
sizeof (Vert),
|
|
|
|
G_STRUCT_OFFSET (Vert, x),
|
|
|
|
2, /* n_components */
|
|
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
|
|
attributes[1] = cogl_attribute_new (attribute_buffer,
|
|
|
|
"cogl_tex_coord_in",
|
|
|
|
sizeof (Vert),
|
|
|
|
G_STRUCT_OFFSET (Vert, s),
|
|
|
|
3, /* n_components */
|
|
|
|
COGL_ATTRIBUTE_TYPE_FLOAT);
|
|
|
|
primitive = cogl_primitive_new_with_attributes (COGL_VERTICES_MODE_TRIANGLES,
|
|
|
|
6 * TEX_DEPTH,
|
|
|
|
attributes,
|
|
|
|
2 /* n_attributes */);
|
|
|
|
|
|
|
|
cogl_primitive_set_indices (primitive,
|
2012-03-16 19:54:13 +00:00
|
|
|
cogl_get_rectangle_indices (ctx,
|
2012-02-09 17:54:07 +00:00
|
|
|
TEX_DEPTH),
|
|
|
|
6 * TEX_DEPTH);
|
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
cogl_framebuffer_draw_primitive (fb, pipeline, primitive);
|
2011-05-05 22:34:38 +00:00
|
|
|
|
|
|
|
g_free (verts);
|
|
|
|
|
2012-02-09 17:54:07 +00:00
|
|
|
cogl_object_unref (primitive);
|
|
|
|
cogl_object_unref (attributes[0]);
|
|
|
|
cogl_object_unref (attributes[1]);
|
|
|
|
cogl_object_unref (attribute_buffer);
|
|
|
|
cogl_object_unref (pipeline);
|
2011-05-05 22:34:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
validate_block (int block_x, int block_y, int z)
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < TEX_HEIGHT; y++)
|
|
|
|
for (x = 0; x < TEX_WIDTH; x++)
|
2012-03-16 19:54:13 +00:00
|
|
|
test_utils_check_pixel_rgb (fb,
|
|
|
|
block_x * TEX_WIDTH + x,
|
2012-02-09 17:54:07 +00:00
|
|
|
block_y * TEX_HEIGHT + y,
|
|
|
|
255 - x * 8,
|
|
|
|
y * 8,
|
|
|
|
255 - z * 8);
|
2011-05-05 22:34:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
validate_result (void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
validate_block (0, 0, 0);
|
|
|
|
|
|
|
|
for (i = 0; i < TEX_DEPTH; i++)
|
|
|
|
validate_block (i, 1, i);
|
|
|
|
}
|
|
|
|
|
2012-02-09 20:32:08 +00:00
|
|
|
static void
|
|
|
|
test_multi_texture (TestState *state)
|
|
|
|
{
|
|
|
|
CoglPipeline *pipeline;
|
2012-02-18 02:11:34 +00:00
|
|
|
CoglTexture3D *tex_3d;
|
2012-02-09 20:32:08 +00:00
|
|
|
CoglTexture2D *tex_2d;
|
Switch use of primitive glib types to c99 equivalents
The coding style has for a long time said to avoid using redundant glib
data types such as gint or gchar etc because we feel that they make the
code look unnecessarily foreign to developers coming from outside of the
Gnome developer community.
Note: When we tried to find the historical rationale for the types we
just found that they were apparently only added for consistent syntax
highlighting which didn't seem that compelling.
Up until now we have been continuing to use some of the platform
specific type such as gint{8,16,32,64} and gsize but this patch switches
us over to using the standard c99 equivalents instead so we can further
ensure that our code looks familiar to the widest range of C developers
who might potentially contribute to Cogl.
So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this
switches all Cogl code to instead use the int{8,16,32,64}_t and
uint{8,16,32,64}_t c99 types instead.
Instead of gsize we now use size_t
For now we are not going to use the c99 _Bool type and instead we have
introduced a new CoglBool type to use instead of gboolean.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 20:56:40 +00:00
|
|
|
uint8_t tex_data[4];
|
2012-02-09 20:32:08 +00:00
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
cogl_framebuffer_clear4f (fb, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 1);
|
2012-02-09 20:32:08 +00:00
|
|
|
|
|
|
|
/* Tests a pipeline that is using multi-texturing to combine a 3D
|
|
|
|
texture with a 2D texture. The texture from another layer is
|
|
|
|
sampled with TEXTURE_? just to pick up a specific bug that was
|
|
|
|
happening with the ARBfp fragend */
|
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
pipeline = cogl_pipeline_new (ctx);
|
2012-02-09 20:32:08 +00:00
|
|
|
|
|
|
|
tex_data[0] = 0xff;
|
|
|
|
tex_data[1] = 0x00;
|
|
|
|
tex_data[2] = 0x00;
|
|
|
|
tex_data[3] = 0xff;
|
2012-03-16 19:54:13 +00:00
|
|
|
tex_2d = cogl_texture_2d_new_from_data (ctx,
|
2012-02-09 20:32:08 +00:00
|
|
|
1, 1, /* width/height */
|
|
|
|
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
|
|
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
|
|
4, /* rowstride */
|
|
|
|
tex_data,
|
|
|
|
NULL);
|
|
|
|
cogl_pipeline_set_layer_texture (pipeline, 0, COGL_TEXTURE (tex_2d));
|
|
|
|
|
|
|
|
tex_data[0] = 0x00;
|
|
|
|
tex_data[1] = 0xff;
|
|
|
|
tex_data[2] = 0x00;
|
|
|
|
tex_data[3] = 0xff;
|
2012-03-16 19:54:13 +00:00
|
|
|
tex_3d = cogl_texture_3d_new_from_data (ctx,
|
2012-02-18 02:11:34 +00:00
|
|
|
1, 1, 1, /* width/height/depth */
|
2012-02-09 20:32:08 +00:00
|
|
|
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
|
|
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
|
|
4, /* rowstride */
|
|
|
|
4, /* image_stride */
|
|
|
|
tex_data,
|
|
|
|
NULL);
|
|
|
|
cogl_pipeline_set_layer_texture (pipeline, 1, COGL_TEXTURE (tex_3d));
|
|
|
|
|
|
|
|
cogl_pipeline_set_layer_combine (pipeline, 0,
|
|
|
|
"RGBA = REPLACE(PREVIOUS)",
|
|
|
|
NULL);
|
|
|
|
cogl_pipeline_set_layer_combine (pipeline, 1,
|
|
|
|
"RGBA = ADD(TEXTURE_0, TEXTURE_1)",
|
|
|
|
NULL);
|
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
cogl_framebuffer_draw_rectangle (fb, pipeline, 0, 0, 10, 10);
|
2012-02-09 20:32:08 +00:00
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
test_utils_check_pixel (fb, 5, 5, 0xffff00ff);
|
2012-02-09 20:32:08 +00:00
|
|
|
|
|
|
|
cogl_object_unref (tex_2d);
|
|
|
|
cogl_object_unref (tex_3d);
|
|
|
|
cogl_object_unref (pipeline);
|
|
|
|
}
|
|
|
|
|
2011-05-05 22:34:38 +00:00
|
|
|
void
|
2012-03-16 19:54:13 +00:00
|
|
|
test_texture_3d (void)
|
2011-05-05 22:34:38 +00:00
|
|
|
{
|
|
|
|
/* Check whether GL supports the rectangle extension. If not we'll
|
|
|
|
just assume the test passes */
|
2012-03-16 19:54:13 +00:00
|
|
|
if (cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_3D))
|
2011-05-05 22:34:38 +00:00
|
|
|
{
|
2012-02-09 17:54:07 +00:00
|
|
|
TestState state;
|
2011-05-05 22:34:38 +00:00
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
state.fb_width = cogl_framebuffer_get_width (fb);
|
|
|
|
state.fb_height = cogl_framebuffer_get_height (fb);
|
2011-05-05 22:34:38 +00:00
|
|
|
|
2012-03-16 19:54:13 +00:00
|
|
|
cogl_framebuffer_orthographic (fb,
|
2012-02-09 17:54:07 +00:00
|
|
|
0, 0, /* x_1, y_1 */
|
|
|
|
state.fb_width, /* x_2 */
|
|
|
|
state.fb_height /* y_2 */,
|
|
|
|
-1, 100 /* near/far */);
|
2011-05-05 22:34:38 +00:00
|
|
|
|
2012-02-09 17:54:07 +00:00
|
|
|
draw_frame (&state);
|
|
|
|
validate_result ();
|
2011-05-05 22:34:38 +00:00
|
|
|
|
2012-02-09 20:32:08 +00:00
|
|
|
test_multi_texture (&state);
|
|
|
|
|
2012-02-23 12:30:51 +00:00
|
|
|
if (cogl_test_verbose ())
|
2011-05-05 22:34:38 +00:00
|
|
|
g_print ("OK\n");
|
|
|
|
}
|
2012-02-23 12:30:51 +00:00
|
|
|
else if (cogl_test_verbose ())
|
2011-05-05 22:34:38 +00:00
|
|
|
g_print ("Skipping\n");
|
|
|
|
}
|
|
|
|
|