sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

tests/cogl: Migrate point size attribute tests

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2555>
This commit is contained in:
Jonas Ådahl 2022-08-04 20:31:32 +02:00 committed by Marge Bot
parent 2746861c6a
commit 41e5ee63d3
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cogl/tests/conform/meson.build
View file

@ -1,6 +1,5 @@
cogl_test_conformance_sources = [ cogl_test_conformance_sources = [
'test-conform-main.c', 'test-conform-main.c',
'test-point-size-attribute.c',
'test-point-sprite.c', 'test-point-sprite.c',
'test-no-gl-header.c', 'test-no-gl-header.c',
'test-version.c', 'test-version.c',

4
cogl/tests/conform/test-conform-main.c
View file

@ -78,10 +78,6 @@ main (int argc, char **argv)
TEST_REQUIREMENT_GL, TEST_REQUIREMENT_GL,
0); 0);
ADD_TEST (test_point_size_attribute,
0, 0);
ADD_TEST (test_point_size_attribute_snippet,
0, 0);
ADD_TEST (test_point_sprite, ADD_TEST (test_point_sprite,
0, 0); 0, 0);
ADD_TEST (test_point_sprite_orientation, ADD_TEST (test_point_sprite_orientation,

2
cogl/tests/conform/test-declarations.h
View file

@ -10,8 +10,6 @@ void test_npot_texture (void);
void test_texture_get_set_data (void); void test_texture_get_set_data (void);
void test_alpha_textures (void); void test_alpha_textures (void);
void test_framebuffer_get_bits (void); void test_framebuffer_get_bits (void);
void test_point_size_attribute (void);
void test_point_size_attribute_snippet (void);
void test_point_sprite (void); void test_point_sprite (void);
void test_point_sprite_orientation (void); void test_point_sprite_orientation (void);
void test_point_sprite_glsl (void); void test_point_sprite_glsl (void);

1
src/tests/cogl/conform/meson.build
View file

@ -21,6 +21,7 @@ cogl_tests = [
[ 'test-read-texture-formats', ['gl', 'gl3'] ], [ 'test-read-texture-formats', ['gl', 'gl3'] ],
[ 'test-write-texture-formats', [] ], [ 'test-write-texture-formats', [] ],
[ 'test-point-size', [] ], [ 'test-point-size', [] ],
[ 'test-point-size-attribute', [] ],
] ]
cogl_test_conformance_includes = [ cogl_test_conformance_includes = [

12
cogl/tests/conform/test-point-size-attribute.c → src/tests/cogl/conform/test-point-size-attribute.c
View file

@ -1,7 +1,6 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include "test-declarations.h" #include "tests/cogl-test-utils.h"
#include "test-utils.h"
/* This test assumes the GL driver supports point sizes up to 16 /* This test assumes the GL driver supports point sizes up to 16
pixels. Cogl should probably have some way of querying the size so pixels. Cogl should probably have some way of querying the size so
@ -139,7 +138,7 @@ do_test (const char *attribute_name,
g_print ("OK\n"); g_print ("OK\n");
} }
void static void
test_point_size_attribute (void) test_point_size_attribute (void)
{ {
do_test ("cogl_point_size_in", NULL); do_test ("cogl_point_size_in", NULL);
@ -161,8 +160,13 @@ setup_snippet (CoglPipeline *pipeline)
cogl_object_unref (snippet); cogl_object_unref (snippet);
} }
void static void
test_point_size_attribute_snippet (void) test_point_size_attribute_snippet (void)
{ {
do_test ("my_super_duper_point_size_attrib", setup_snippet); do_test ("my_super_duper_point_size_attrib", setup_snippet);
} }
COGL_TEST_SUITE (
g_test_add_func ("/point-size/attribute", test_point_size_attribute);
g_test_add_func ("/point-size/attribute-snippet", test_point_size_attribute_snippet);
)