From ca0e467a3b0668c9bf9ce8efa770a0be20002fbd Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 31 Mar 2022 12:30:10 -0300 Subject: [PATCH] tests/interactive: Drop test-cogl-image-convert This test exercises a form of image conversion that isn't exposed in the new CoglTexture2D APIs, which is about to be removed. Drop this test. Part-of: --- src/tests/clutter/interactive/meson.build | 1 - .../interactive/test-cogl-tex-convert.c | 186 ------------------ 2 files changed, 187 deletions(-) delete mode 100644 src/tests/clutter/interactive/test-cogl-tex-convert.c diff --git a/src/tests/clutter/interactive/meson.build b/src/tests/clutter/interactive/meson.build index e853184ef..a7edc1bf0 100644 --- a/src/tests/clutter/interactive/meson.build +++ b/src/tests/clutter/interactive/meson.build @@ -22,7 +22,6 @@ clutter_tests_interactive_test_sources = [ 'test-grab.c', 'test-cogl-shader-glsl.c', 'test-cogl-tex-tile.c', - 'test-cogl-tex-convert.c', 'test-cogl-offscreen.c', 'test-cogl-tex-polygon.c', 'test-animation.c', diff --git a/src/tests/clutter/interactive/test-cogl-tex-convert.c b/src/tests/clutter/interactive/test-cogl-tex-convert.c deleted file mode 100644 index d35e9318b..000000000 --- a/src/tests/clutter/interactive/test-cogl-tex-convert.c +++ /dev/null @@ -1,186 +0,0 @@ -#include -#include -#include -#include -#include - -#include "tests/clutter-test-utils.h" - -/* Coglbox declaration - *--------------------------------------------------*/ - -G_BEGIN_DECLS - -#define TEST_TYPE_COGLBOX test_coglbox_get_type() - -static -G_DECLARE_FINAL_TYPE (TestCoglbox, test_coglbox, TEST, COGLBOX, ClutterActor) - -struct _TestCoglbox -{ - ClutterActor parent; - - CoglTexture *cogl_tex_id[4]; - gint frame; -}; - -G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR); - -int -test_cogl_tex_convert_main (int argc, char *argv[]); - -const char * -test_cogl_tex_convert_describe (void); - -G_END_DECLS - -/* Coglbox implementation - *--------------------------------------------------*/ - -static void -test_coglbox_paint (ClutterActor *self, - ClutterPaintContext *paint_context) -{ - TestCoglbox *coglbox = TEST_COGLBOX (self); - CoglPipeline *pipeline; - CoglFramebuffer *framebuffer = - clutter_paint_context_get_framebuffer (paint_context); - CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); - gfloat texcoords[4] = { 0.0, 0.0, 1.0, 1.0 }; - - pipeline = cogl_pipeline_new (ctx); - cogl_pipeline_set_color4ub (pipeline, 0x66, 0x66, 0xdd, 0xff); - cogl_framebuffer_draw_rectangle (framebuffer, pipeline, 0, 0, 400, 400); - cogl_object_unref (pipeline); - - pipeline = cogl_pipeline_new (ctx); - - cogl_framebuffer_push_matrix (framebuffer); - cogl_pipeline_set_layer_texture (pipeline, 0, coglbox->cogl_tex_id[0]); - cogl_framebuffer_draw_textured_rectangle (framebuffer, pipeline, - 0, 0, 200, 213, - texcoords[0], texcoords[1], - texcoords[2], texcoords[3]); - - cogl_framebuffer_pop_matrix (framebuffer); - cogl_framebuffer_push_matrix (framebuffer); - cogl_framebuffer_translate (framebuffer, 200, 0, 0); - cogl_pipeline_set_layer_texture (pipeline, 0, coglbox->cogl_tex_id[1]); - cogl_framebuffer_draw_textured_rectangle (framebuffer, pipeline, - 0, 0, 200, 213, - texcoords[0], texcoords[1], - texcoords[2], texcoords[3]); - - cogl_framebuffer_pop_matrix (framebuffer); - cogl_framebuffer_push_matrix (framebuffer); - cogl_framebuffer_translate (framebuffer, 0, 200, 0); - cogl_pipeline_set_layer_texture (pipeline, 0, coglbox->cogl_tex_id[2]); - cogl_framebuffer_draw_textured_rectangle (framebuffer, pipeline, - 0, 0, 200, 213, - texcoords[0], texcoords[1], - texcoords[2], texcoords[3]); - - cogl_framebuffer_pop_matrix (framebuffer); - cogl_framebuffer_push_matrix (framebuffer); - cogl_framebuffer_translate (framebuffer, 200, 200, 0); - cogl_pipeline_set_layer_texture (pipeline, 0, coglbox->cogl_tex_id[3]); - cogl_framebuffer_draw_textured_rectangle (framebuffer, pipeline, - 0, 0, 200, 213, - texcoords[0], texcoords[1], - texcoords[2], texcoords[3]); - cogl_framebuffer_pop_matrix (framebuffer); - - cogl_object_unref (pipeline); - -} - -static void -test_coglbox_dispose (GObject *object) -{ - TestCoglbox *coglbox = TEST_COGLBOX (object); - - cogl_object_unref (coglbox->cogl_tex_id); - - G_OBJECT_CLASS (test_coglbox_parent_class)->dispose (object); -} - -static void -test_coglbox_init (TestCoglbox *self) -{ - gchar *file; - - file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); - - self->cogl_tex_id[0] = - cogl_texture_new_from_file (file, - COGL_TEXTURE_NONE, - COGL_PIXEL_FORMAT_ANY, - NULL); - - self->cogl_tex_id[1] = - cogl_texture_new_from_file (file, - COGL_TEXTURE_NONE, - COGL_PIXEL_FORMAT_BGRA_8888, - NULL); - - self->cogl_tex_id[2] = - cogl_texture_new_from_file (file, - COGL_TEXTURE_NONE, - COGL_PIXEL_FORMAT_ARGB_8888, - NULL); - - self->cogl_tex_id[3] = - cogl_texture_new_from_file (file, - COGL_TEXTURE_NONE, - COGL_PIXEL_FORMAT_G_8, - NULL); - - g_free (file); -} - -static void -test_coglbox_class_init (TestCoglboxClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass); - - gobject_class->dispose = test_coglbox_dispose; - actor_class->paint = test_coglbox_paint; -} - -static ClutterActor* -test_coglbox_new (void) -{ - return g_object_new (TEST_TYPE_COGLBOX, NULL); -} - -G_MODULE_EXPORT int -test_cogl_tex_convert_main (int argc, char *argv[]) -{ - ClutterActor *stage; - ClutterActor *coglbox; - - clutter_test_init (&argc, &argv); - - /* Stage */ - stage = clutter_test_get_stage (); - clutter_actor_set_size (stage, 400, 400); - clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Conversion"); - g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL); - - /* Cogl Box */ - coglbox = test_coglbox_new (); - clutter_container_add_actor (CLUTTER_CONTAINER (stage), coglbox); - - clutter_actor_show (stage); - - clutter_test_main (); - - return 0; -} - -G_MODULE_EXPORT const char * -test_cogl_tex_convert_describe (void) -{ - return "Pixel format conversion of Cogl textures."; -}