eb7ef457cb
This adds COGL_PIXEL_FORMAT_RG_88 and COGL_TEXTURE_COMPONENTS_RG in order to support two-component textures. The RG components for a texture is only supported if COGL_FEATURE_ID_TEXTURE_RG is advertised. This is only available on GL 3, GL 2 with the GL_ARB_texture_rg extension or GLES with the GL_EXT_texture_rg extension. The RG pixel format is always supported for images because Cogl can easily do the conversion if an application uses this format to upload to a texture with a different format. If an application tries to create an RG texture when the feature isn't supported then it will raise an error when the texture is allocated. https://bugzilla.gnome.org/show_bug.cgi?id=712830 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 568677ab3bcb62ababad1623be0d6b9b117d0a26) Conflicts: cogl/cogl-bitmap-packing.h cogl/cogl-types.h cogl/driver/gl/gl/cogl-driver-gl.c tests/conform/test-read-texture-formats.c tests/conform/test-write-texture-formats.c
74 lines
2.1 KiB
C
74 lines
2.1 KiB
C
#include <cogl/cogl.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "test-utils.h"
|
|
|
|
#define TEX_WIDTH 8
|
|
#define TEX_HEIGHT 8
|
|
|
|
static CoglTexture2D *
|
|
make_texture (void)
|
|
{
|
|
uint8_t tex_data[TEX_WIDTH * TEX_HEIGHT * 2], *p = tex_data;
|
|
int x, y;
|
|
|
|
for (y = 0; y < TEX_HEIGHT; y++)
|
|
for (x = 0; x < TEX_WIDTH; x++)
|
|
{
|
|
*(p++) = x * 256 / TEX_WIDTH;
|
|
*(p++) = y * 256 / TEX_HEIGHT;
|
|
}
|
|
|
|
return cogl_texture_2d_new_from_data (test_ctx,
|
|
TEX_WIDTH, TEX_HEIGHT,
|
|
COGL_PIXEL_FORMAT_RG_88,
|
|
TEX_WIDTH * 2,
|
|
tex_data,
|
|
NULL);
|
|
}
|
|
|
|
void
|
|
test_texture_rg (void)
|
|
{
|
|
CoglPipeline *pipeline;
|
|
CoglTexture2D *tex;
|
|
int fb_width, fb_height;
|
|
int x, y;
|
|
|
|
fb_width = cogl_framebuffer_get_width (test_fb);
|
|
fb_height = cogl_framebuffer_get_height (test_fb);
|
|
|
|
tex = make_texture ();
|
|
|
|
g_assert (cogl_texture_get_components (tex) == COGL_TEXTURE_COMPONENTS_RG);
|
|
|
|
pipeline = cogl_pipeline_new (test_ctx);
|
|
|
|
cogl_pipeline_set_layer_texture (pipeline, 0, tex);
|
|
cogl_pipeline_set_layer_filters (pipeline,
|
|
0,
|
|
COGL_PIPELINE_FILTER_NEAREST,
|
|
COGL_PIPELINE_FILTER_NEAREST);
|
|
|
|
cogl_framebuffer_draw_rectangle (test_fb,
|
|
pipeline,
|
|
-1.0f, 1.0f,
|
|
1.0f, -1.0f);
|
|
|
|
for (y = 0; y < TEX_HEIGHT; y++)
|
|
for (x = 0; x < TEX_WIDTH; x++)
|
|
{
|
|
test_utils_check_pixel_rgb (test_fb,
|
|
x * fb_width / TEX_WIDTH +
|
|
fb_width / (TEX_WIDTH * 2),
|
|
y * fb_height / TEX_HEIGHT +
|
|
fb_height / (TEX_HEIGHT * 2),
|
|
x * 256 / TEX_WIDTH,
|
|
y * 256 / TEX_HEIGHT,
|
|
0);
|
|
}
|
|
|
|
cogl_object_unref (pipeline);
|
|
cogl_object_unref (tex);
|
|
}
|